Android: Allow compiling browser without Java UI

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 8379c7a4bdfa9ddeee7f8c729182286d30bf24ca..dd0f842de13aebc2da9e979642c95082a3b46250 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -51,9 +51,9 @@ android_resources("chrome_java_resources") {
   deps = [
     ":chrome_locale_paks",
     ":chrome_strings_grd",
+    "//chrome/app:java_strings_grd",
     "//components/policy:app_restrictions_resources",
     "//content/public/android:content_java_resources",
-    "//chrome/app:java_strings_grd",
     "//third_party/android_data_chart:android_data_chart_java_resources",
     "//third_party/android_media:android_media_resources",
   ]
@@ -117,27 +117,16 @@ java_strings_grd("chrome_strings_grd") {
 # GYP: //chrome/chrome.gyp:chrome_java
 android_library("chrome_java") {

[no sievers, 2015/11/25 22:54:29]

i've not mirrored these changes to gyp, though i could.

i've kept gypi and GN consistent in the other changes though just to make it
less confusing to people and less likely they will break this fragile thing.

   deps = [
-    ":chrome_java_resources",
-    ":document_tab_model_info_proto_java",
     "//base:base_java",
-    "//net/android:net_java",
-    "//components/bookmarks/common/android:bookmarks_java",
-    "//components/dom_distiller/android:dom_distiller_content_java",
-    "//components/dom_distiller/android:dom_distiller_core_java",
-    "//components/gcm_driver/android:gcm_driver_java",
-    "//components/invalidation/impl:java",
-    "//components/navigation_interception/android:navigation_interception_java",
-    "//components/policy/android:policy_java",
-    "//components/precache/android:precache_java",
     "//components/safe_json/android:safe_json_java",
-    "//components/service_tab_launcher:service_tab_launcher_java",
-    "//components/signin/core/browser/android:java",
     "//components/variations/android:variations_java",
-    "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//content/public/android:content_java",
     "//media/base/android:media_java",
+    "//media/base/android:media_java",
+    "//media/midi:midi_java",
+    "//net/android:net_java",
     "//printing:printing_java",
-    "//sync/android:sync_java",
+    "//third_party/WebKit/public:blink_headers_java",
     "//third_party/android_data_chart:android_data_chart_java",
     "//third_party/android_media:android_media_java",
     "//third_party/android_protobuf:protobuf_nano_javalib",
@@ -152,9 +141,6 @@ android_library("chrome_java") {
     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
     "//third_party/gif_player:gif_player_java",
     "//third_party/jsr-305:jsr_305_javalib",
-    "//third_party/WebKit/public:blink_headers_java",
-    "//media/base/android:media_java",
-    "//media/midi:midi_java",
     "//ui/android:ui_java",
     "//ui/android:ui_java_resources",
     google_play_services_library,
@@ -164,17 +150,39 @@ android_library("chrome_java") {
     ":chrome_android_java_enums_srcjar",
     ":chrome_android_java_google_api_keys_srcjar",
     ":chrome_version_srcjar",
-    ":custom_tabs_service_aidl",
     ":resource_id_javagen",
-    "//chrome:page_info_connection_type_javagen",
     "//chrome:content_setting_javagen",
     "//chrome:content_settings_type_javagen",
-    "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar",
-    "//components/offline_pages:offline_pages_enums_java",
-    "//components/omnibox/browser:autocomplete_match_type_javagen",
   ]
 
-  DEPRECATED_java_in_dir = "java/src"
+  if (android_java_ui) {
+    DEPRECATED_java_in_dir = "java/src"
+
+    srcjar_deps += [
+      ":custom_tabs_service_aidl",
+      "//chrome:page_info_connection_type_javagen",
+      "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar",
+      "//components/offline_pages:offline_pages_enums_java",
+      "//components/omnibox/browser:autocomplete_match_type_javagen",
+    ]
+
+    deps += [
+      ":chrome_java_resources",
+      ":document_tab_model_info_proto_java",
+      "//components/bookmarks/common/android:bookmarks_java",
+      "//components/dom_distiller/android:dom_distiller_content_java",
+      "//components/dom_distiller/android:dom_distiller_core_java",
+      "//components/gcm_driver/android:gcm_driver_java",
+      "//components/invalidation/impl:java",
+      "//components/navigation_interception/android:navigation_interception_java",
+      "//components/policy/android:policy_java",
+      "//components/precache/android:precache_java",
+      "//components/service_tab_launcher:service_tab_launcher_java",
+      "//components/signin/core/browser/android:java",
+      "//components/web_contents_delegate_android:web_contents_delegate_android_java",
+      "//sync/android:sync_java",
+    ]
+  }
 }
 
 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java
@@ -257,9 +265,9 @@ junit_binary("chrome_junit_tests") {
     "//components/invalidation/impl:java",
     "//sync:sync_java_test_support",
     "//sync/android:sync_java",
+    "//third_party/android_tools:android_support_v7_mediarouter_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/junit:hamcrest",
-    "//third_party/android_tools:android_support_v7_mediarouter_java",
     google_play_services_library,
   ]
 }
@@ -322,12 +330,12 @@ android_library("chrome_shared_test_java") {
     "//net/android:net_java",
     "//net/android:net_java_test_support",
     "//printing:printing_java",
+    "//sync:sync_java_test_support",
     "//sync/android:sync_java",
     "//sync/android:sync_javatests",
-    "//sync:sync_java_test_support",
+    "//third_party/android_tools:android_support_v13_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
-    "//third_party/android_tools:android_support_v13_java",
     "//third_party/android_tools:legacy_http_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/jsr-305:jsr_305_javalib",