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

Unified Diff: build/secondary/third_party/android_tools/BUILD.gn

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/sanitizers/tsan_suppressions.cc ('k') | build/secondary/third_party/freetype/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/secondary/third_party/android_tools/BUILD.gn
diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
index 099b892b560bbc4f73467cff948726d202c06965..dc934cb93e40b50637fdfd939f6726d272f02e3e 100644
--- a/build/secondary/third_party/android_tools/BUILD.gn
+++ b/build/secondary/third_party/android_tools/BUILD.gn
@@ -34,7 +34,7 @@ android_java_prebuilt("android_support_v13_java") {
}
android_resources("android_support_v7_appcompat_resources") {
- v14_verify_only = true
+ v14_skip = true
resource_dirs =
[ "$android_sdk_root/extras/android/support/v7/appcompat/res" ]
custom_package = "android.support.v7.appcompat"
@@ -48,7 +48,7 @@ android_java_prebuilt("android_support_v7_appcompat_java") {
}
android_resources("android_support_v7_mediarouter_resources") {
- v14_verify_only = true
+ v14_skip = true
resource_dirs =
[ "$android_sdk_root/extras/android/support/v7/mediarouter/res" ]
deps = [
@@ -65,15 +65,23 @@ android_java_prebuilt("android_support_v7_mediarouter_java") {
jar_path = "$android_sdk_root/extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar"
}
+android_resources("android_support_v7_recyclerview_resources") {
+ v14_skip = true
+ resource_dirs =
+ [ "$android_sdk_root/extras/android/support/v7/recyclerview/res" ]
+ custom_package = "android.support.v7.recyclerview"
+}
+
android_java_prebuilt("android_support_v7_recyclerview_java") {
deps = [
":android_support_v7_appcompat_java",
+ ":android_support_v7_recyclerview_resources",
]
jar_path = "$android_sdk_root/extras/android/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar"
}
android_resources("google_play_services_default_resources") {
- v14_verify_only = true
+ v14_skip = true
resource_dirs = [ "$android_sdk_root/extras/google/google_play_services/libproject/google-play-services_lib/res" ]
custom_package = "com.google.android.gms"
}
« no previous file with comments | « build/sanitizers/tsan_suppressions.cc ('k') | build/secondary/third_party/freetype/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698