Android: Allow compiling browser without Java UI

chrome/browser/ui/BUILD.gn

Index: chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index f89f2b2acddb72235dda9b5ba122ed3268fb88ed..dc84f8b418e3b7d6ed095a6b6db0dc387c7ff404 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -117,8 +117,8 @@ source_set("ui") {
       "//third_party/WebKit/public:resources",
       "//third_party/adobe/flash:flapper_version_h",
       "//third_party/leveldatabase",
-      "//third_party/mojo/src/mojo/edk/system",
       "//third_party/libjingle",
+      "//third_party/mojo/src/mojo/edk/system",
       "//third_party/re2",
       "//ui/base/ime",
       "//ui/compositor",
@@ -330,19 +330,19 @@ source_set("ui") {
   }
 
   if (is_android) {
-    deps += [
-      "//chrome/browser:jni_headers",
-      "//crypto:platform",
-    ]
+    deps += [ "//crypto:platform" ]
 
     defines += [ "CHROME_BUILD_ID=" + android_chrome_build_id ]
 
-    if (!use_aura) {
+    if (android_java_ui) {
       sources +=
-          rebase_path(gypi_values.chrome_browser_ui_android_non_aura_sources,
+          rebase_path(gypi_values.chrome_browser_ui_android_java_ui_sources,
                       ".",
                       "//chrome")
-      deps += [ "//components/web_contents_delegate_android" ]
+      deps += [
+        "//chrome/browser:jni_headers",
+        "//components/web_contents_delegate_android",
+      ]
       deps -= [ "//ui/events" ]
     }
   }
@@ -399,9 +399,9 @@ source_set("ui") {
       "//chrome/installer/util:strings",
       "//components/search_engines",
       "//google_update",
-      "//third_party/wtl",
       "//third_party/iaccessible2",
       "//third_party/isimpledom",
+      "//third_party/wtl",
       "//ui/app_list",
     ]
     if (!is_chrome_branded) {