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

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

Issue 1841863002: Update monet. (Closed) Base URL: https://github.com/domokit/monet.git@master
Patch Set: Created 4 years, 9 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/secondary/testing/gtest/BUILD.gn ('k') | build/secondary/third_party/leveldatabase/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 f054125f3f951c9ebdf6b5470ca571942b57dc3d..c674d9a892be926634d076dacb9a5d90d3dd463c 100644
--- a/build/secondary/third_party/android_tools/BUILD.gn
+++ b/build/secondary/third_party/android_tools/BUILD.gn
@@ -20,9 +20,10 @@ source_set("cpu_features") {
configs += [ "//build/config/compiler:no_chromium_code" ]
}
-android_java_prebuilt("android_gcm_java") {
- jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar"
-}
+# TODO(vtl): This doesn't seem to exist. Can we just get rid of it?
+#android_java_prebuilt("android_gcm_java") {
+# jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar"
+#}
android_java_prebuilt("uiautomator_java") {
jar_path = "$android_sdk/uiautomator.jar"
@@ -65,9 +66,17 @@ 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"
}
« no previous file with comments | « build/secondary/testing/gtest/BUILD.gn ('k') | build/secondary/third_party/leveldatabase/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698