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

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

Issue 1419533002: Roll android_tools deps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed setImageResource(0) crash 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 | « build/config/android/config.gni ('k') | chrome/android/java/res/drawable-hdpi/ic_collapse.png » ('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 15 matching lines...) Expand all
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") { 31 android_resources("android_support_design_resources") {
32 v14_skip = true 32 v14_skip = true
33 resource_dirs = [ "$android_sdk_root/extras/android/support/design/res" ] 33 resource_dirs = [ "$android_sdk_root/extras/android/support/design/res" ]
34 deps = [ 34 deps = [
35 ":android_support_v7_appcompat_resources", 35 ":android_support_v7_appcompat_resources",
36 ":android_support_v7_recyclerview_resources",
36 ] 37 ]
37 custom_package = "android.support.design" 38 custom_package = "android.support.design"
38 } 39 }
39 40
40 android_java_prebuilt("android_support_design_java") { 41 android_java_prebuilt("android_support_design_java") {
41 deps = [ 42 deps = [
42 ":android_support_v7_appcompat_java", 43 ":android_support_v7_appcompat_java",
43 ":android_support_design_resources", 44 ":android_support_design_resources",
44 ] 45 ]
45 jar_path = "$android_sdk_root/extras/android/support/design/libs/android-suppo rt-design.jar" 46 jar_path = "$android_sdk_root/extras/android/support/design/libs/android-suppo rt-design.jar"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 ] 149 ]
149 outputs = [ 150 outputs = [
150 "$target_gen_dir/checked_sdk_extras_version.stamp", 151 "$target_gen_dir/checked_sdk_extras_version.stamp",
151 ] 152 ]
152 } 153 }
153 154
154 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. 155 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
155 android_java_prebuilt("legacy_http_javalib") { 156 android_java_prebuilt("legacy_http_javalib") {
156 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" 157 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
157 } 158 }
OLDNEW
« no previous file with comments | « build/config/android/config.gni ('k') | chrome/android/java/res/drawable-hdpi/ic_collapse.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698