Aura on Android: content/browser

content/browser/BUILD.gn

Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index a334f00988be6911cb0f0cbd305478fd40a10d6a..835105ebca9b69125f64aa8a5e742e29fc5a2e4c 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -328,10 +328,6 @@ source_set("browser") {
     sources += rebase_path(content_browser_gypi_values.android_browser_sources,
                            ".",
                            "//content")
-    sources += rebase_path(
-            content_browser_gypi_values.android_in_process_browser_sources,
-            ".",
-            "//content")
     sources -= [
       "browser_ipc_logging.cc",
       "device_sensors/data_fetcher_shared_memory_default.cc",
@@ -341,7 +337,6 @@ source_set("browser") {
       "geolocation/network_location_request.h",
       "power_usage_monitor_impl.cc",
       "power_usage_monitor_impl.h",
-      "renderer_host/begin_frame_observer_proxy.cc",
       "tracing/tracing_ui.cc",
       "tracing/tracing_ui.h",
 
@@ -367,6 +362,19 @@ source_set("browser") {
       "speech/speech_recognizer_impl.cc",
       "speech/speech_recognizer_impl.h",
     ]
+
+    if (!use_aura) {
+      sources += rebase_path(
+              content_browser_gypi_values.android_non_aura_browser_sources,
+              ".",
+              "//content")
+      sources += rebase_path(
+              content_browser_gypi_values.android_in_process_browser_sources,
+              ".",
+              "//content")
+      sources -= [ "renderer_host/begin_frame_observer_proxy.cc" ]
+    }
+
     deps -= [ "//device/battery" ]
     deps += [
       "//content/public/android:jni",