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

Unified Diff: chrome/android/BUILD.gn

Issue 1089143002: Make the Android GN debug component build actually build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix extra whitespace Created 5 years, 8 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 | « base/third_party/nspr/BUILD.gn ('k') | chrome/test/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 14e633515e24621b131d8a1302500625fd2b26ce..864283858076ec045fc122f399a166af2a075690 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -412,11 +412,16 @@ android_library("chrome_javatests") {
"//components/bookmarks/common/android:bookmarks_java",
"//components/dom_distiller/android:dom_distiller_core_java",
"//components/invalidation:java",
+ "//components/navigation_interception/android:navigation_interception_java",
+ "//components/precache/android:precache_java",
+ "//components/precache/android:precache_javatests",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
"//printing:printing_java",
"//sync/android:sync_java",
+ "//sync/android:sync_javatests",
"//sync:sync_java_test_support",
+ "//third_party/android_protobuf:protobuf_nano_javalib",
"//third_party/android_tools:android_support_v13_java",
"//third_party/android_tools:android_support_v7_appcompat_java",
"//third_party/cacheinvalidation:cacheinvalidation_javalib",
@@ -468,27 +473,31 @@ junit_binary("chrome_junit_tests") {
}
# GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk
-android_apk("chrome_sync_shell_test_apk") {
- testonly = true
- deps = [
- ":chrome_java",
- ":chrome_shell_java",
- ":chrome_shell_test_java",
- "//base:base_java",
- "//base:base_java_test_support",
- "//chrome/test/android:chrome_java_test_support",
- "//components/invalidation:java",
- "//content/public/android:content_java",
- "//content/public/test/android:content_java_test_support",
- "//sync/android:sync_java",
- "//sync:sync_java_test_support",
- "//third_party/android_tools:android_support_v13_java",
- "//third_party/android_tools:android_support_v7_appcompat_java",
- "//ui/android:ui_java",
- ]
- apk_name = "ChromeSyncShellTest"
- DEPRECATED_java_in_dir = "sync_shell/javatests/src"
- android_manifest = "sync_shell/javatests/AndroidManifest.xml"
+if (false) {
+ # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be ported.
+ # crbug.com/475612
+ android_apk("chrome_sync_shell_test_apk") {
+ testonly = true
+ deps = [
+ ":chrome_java",
+ ":chrome_shell_java",
+ ":chrome_shell_test_java",
+ "//base:base_java",
+ "//base:base_java_test_support",
+ "//chrome/test/android:chrome_java_test_support",
+ "//components/invalidation:java",
+ "//content/public/android:content_java",
+ "//content/public/test/android:content_java_test_support",
+ "//sync/android:sync_java",
+ "//sync:sync_java_test_support",
+ "//third_party/android_tools:android_support_v13_java",
+ "//third_party/android_tools:android_support_v7_appcompat_java",
+ "//ui/android:ui_java",
+ ]
+ apk_name = "ChromeSyncShellTest"
+ DEPRECATED_java_in_dir = "sync_shell/javatests/src"
+ android_manifest = "sync_shell/javatests/AndroidManifest.xml"
+ }
}
# GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests_java
« no previous file with comments | « base/third_party/nspr/BUILD.gn ('k') | chrome/test/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698