Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: build/secondary/third_party/android_tools/BUILD.gn

Issue 2132033002: Revert of Remove android_support_annotations target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | components/cronet.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/rules.gni") 5 import("//build/config/android/rules.gni")
6 6
7 config("cpu_features_include") { 7 config("cpu_features_include") {
8 include_dirs = [ "ndk/sources/android/cpufeatures" ] 8 include_dirs = [ "ndk/sources/android/cpufeatures" ]
9 } 9 }
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 custom_package = "android.support.design" 49 custom_package = "android.support.design"
50 } 50 }
51 51
52 android_java_prebuilt("android_support_design_java") { 52 android_java_prebuilt("android_support_design_java") {
53 deps = [ 53 deps = [
54 ":android_support_design_resources", 54 ":android_support_design_resources",
55 ] 55 ]
56 jar_path = "$android_sdk_root/extras/android/support/design/libs/android-suppo rt-design.jar" 56 jar_path = "$android_sdk_root/extras/android/support/design/libs/android-suppo rt-design.jar"
57 } 57 }
58 58
59 android_java_prebuilt("android_support_annotations_javalib") {
60 jar_path = "$android_sdk_root/extras/android/support/annotations/android-suppo rt-annotations.jar"
61 }
62
59 java_prebuilt("android_support_multidex_java") { 63 java_prebuilt("android_support_multidex_java") {
60 supports_android = true 64 supports_android = true
61 jar_path = "$android_sdk_root/extras/android/support/multidex/library/libs/and roid-support-multidex.jar" 65 jar_path = "$android_sdk_root/extras/android/support/multidex/library/libs/and roid-support-multidex.jar"
62 } 66 }
63 67
64 android_java_prebuilt("android_support_v13_java") { 68 android_java_prebuilt("android_support_v13_java") {
65 jar_path = 69 jar_path =
66 "$android_sdk_root/extras/android/support/v13/android-support-v13.jar" 70 "$android_sdk_root/extras/android/support/v13/android-support-v13.jar"
67 } 71 }
68 72
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 ":android_support_v7_recyclerview_java", 147 ":android_support_v7_recyclerview_java",
144 ] 148 ]
145 jar_path = "$android_sdk_root/extras/android/support/v17/leanback/libs/android -support-v17-leanback.jar" 149 jar_path = "$android_sdk_root/extras/android/support/v17/leanback/libs/android -support-v17-leanback.jar"
146 } 150 }
147 151
148 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. 152 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
149 android_java_prebuilt("legacy_http_javalib") { 153 android_java_prebuilt("legacy_http_javalib") {
150 testonly = true 154 testonly = true
151 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" 155 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
152 } 156 }
OLDNEW
« no previous file with comments | « no previous file | components/cronet.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698