NOT FOR REVIEW: Aura on Android - content shell compiles

content/shell/android/BUILD.gn

Index: content/shell/android/BUILD.gn
diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn
index 68b2232bc206188f005fc1ecbbcfa52d6205bf53..3d9eb590387e9bc091a889de2dcdebaf637d6e04 100644
--- a/content/shell/android/BUILD.gn
+++ b/content/shell/android/BUILD.gn
@@ -15,6 +15,14 @@ generate_jni("content_shell_jni_headers") {
     "java/src/org/chromium/content_shell/ShellManager.java",
     "java/src/org/chromium/content_shell/ShellMojoTestUtils.java",
   ]
+
+  if (use_aura) {
+    sources -= [
+      "java/src/org/chromium/content_shell/ShellLayoutTestUtils.java",
+      "java/src/org/chromium/content_shell/ShellManager.java",
+      "java/src/org/chromium/content_shell/ShellMojoTestUtils.java",
+    ]
+  }
 }
 
 shared_library("libcontent_shell_content_view") {
@@ -32,6 +40,7 @@ shared_library("libcontent_shell_content_view") {
   ]
 }
 
+# TODO(mfomitchev): we don't need shell_view.xml for Aura
 android_resources("content_shell_java_resources") {
   testonly = true
   resource_dirs = [ "java/res" ]
@@ -49,7 +58,20 @@ android_library("content_shell_java") {
     "//ui/android:ui_java",
     ":content_shell_java_resources",
   ]
-  DEPRECATED_java_in_dir = "java/src"
+  java_files = [
+    "java/src/org/chromium/content_shell/Shell.java",
+    "java/src/org/chromium/content_shell/ShellLayoutTestUtils.java",
+    "java/src/org/chromium/content_shell/ShellManager.java",
+    "java/src/org/chromium/content_shell/ShellMojoTestUtils.java",
+  ]
+
+  if (use_aura) {
+    java_files -= [
+      "java/src/org/chromium/content_shell/ShellLayoutTestUtils.java",
+      "java/src/org/chromium/content_shell/ShellManager.java",
+      "java/src/org/chromium/content_shell/ShellMojoTestUtils.java",
+    ]
+  }
 }
 
 content_shell_manifest =
@@ -63,7 +85,11 @@ jinja_template("content_shell_manifest") {
 
 android_resources("content_shell_apk_resources") {
   testonly = true
-  resource_dirs = [ "shell_apk/res" ]
+  if (use_aura) {
+    resource_dirs = [ "shell_apk/res" ]
+  } else {
+    resource_dirs = [ "aura_shell_apk/res" ]
+  }
   deps = [
     ":content_shell_java_resources",
     ":content_shell_manifest",
@@ -82,7 +108,12 @@ android_library("content_shell_apk_java") {
     "//net/android:net_java",
     "//ui/android:ui_java",
   ]
-  DEPRECATED_java_in_dir = "shell_apk/src"
+
+  if (use_aura) {
+    DEPRECATED_java_in_dir = "aura_shell_apk/src"
+  } else {
+    DEPRECATED_java_in_dir = "shell_apk/src"
+  }
 }
 
 content_shell_assets_dir = "$root_build_dir/content_shell/assets"