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

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

Issue 1419553003: Revert "Introduce support design library to chrome and roll android_tools/" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Proper rebase Created 5 years, 1 month 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 | chrome/android/BUILD.gn » ('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 10 matching lines...) Expand all
21 } 21 }
22 22
23 android_java_prebuilt("android_gcm_java") { 23 android_java_prebuilt("android_gcm_java") {
24 jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar" 24 jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar"
25 } 25 }
26 26
27 android_java_prebuilt("uiautomator_java") { 27 android_java_prebuilt("uiautomator_java") {
28 jar_path = "$android_sdk/uiautomator.jar" 28 jar_path = "$android_sdk/uiautomator.jar"
29 } 29 }
30 30
31 android_resources("android_support_design_resources") {
32 v14_skip = true
33 resource_dirs = [ "$android_sdk_root/extras/android/support/design/res" ]
34 deps = [
35 ":android_support_v7_appcompat_resources",
36 ":android_support_v7_recyclerview_resources",
37 ]
38 custom_package = "android.support.design"
39 }
40
41 android_java_prebuilt("android_support_design_java") {
42 deps = [
43 ":android_support_v7_appcompat_java",
44 ":android_support_design_resources",
45 ]
46 jar_path = "$android_sdk_root/extras/android/support/design/libs/android-suppo rt-design.jar"
47 }
48
49 android_java_prebuilt("android_support_annotations_javalib") { 31 android_java_prebuilt("android_support_annotations_javalib") {
50 jar_path = "$android_sdk_root/extras/android/support/annotations/android-suppo rt-annotations.jar" 32 jar_path = "$android_sdk_root/extras/android/support/annotations/android-suppo rt-annotations.jar"
51 } 33 }
52 34
53 java_prebuilt("android_support_multidex_java") { 35 java_prebuilt("android_support_multidex_java") {
54 supports_android = true 36 supports_android = true
55 jar_path = "$android_sdk_root/extras/android/support/multidex/library/libs/and roid-support-multidex.jar" 37 jar_path = "$android_sdk_root/extras/android/support/multidex/library/libs/and roid-support-multidex.jar"
56 } 38 }
57 39
58 android_java_prebuilt("android_support_v13_java") { 40 android_java_prebuilt("android_support_v13_java") {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 ] 131 ]
150 outputs = [ 132 outputs = [
151 "$target_gen_dir/checked_sdk_extras_version.stamp", 133 "$target_gen_dir/checked_sdk_extras_version.stamp",
152 ] 134 ]
153 } 135 }
154 136
155 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. 137 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
156 android_java_prebuilt("legacy_http_javalib") { 138 android_java_prebuilt("legacy_http_javalib") {
157 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" 139 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
158 } 140 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698