Add ChromeShellTestApk and other chrome/ test stuff

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 202fcd39be40321baff969d4850ca487a7291456..076e956252802ac3015ca9f4f88efd027f7fb194 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -349,17 +349,6 @@ copy_ex("chrome_shell_assets") {
   }
 }
 
-#TODO(GYP):
-#'variables': {
-#'conditions': [
-#['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', {
-## Only enable the chromium linker on regular builds, since the
-## component build crashes on Android 4.4. See b/11379966
-#'use_chromium_linker': '1',
-#}],
-#],
-#},
-
 # GYP: //chrome/chrome_browser.gypi:chrome_shell_apk
 android_apk("chrome_shell_apk") {
   testonly = true
@@ -375,6 +364,18 @@ android_apk("chrome_shell_apk") {
     "$root_build_dir/lib.stripped/libchrome_shell.so"
   ]
   asset_location = chrome_shell_assets_dir
+
+#TODO(GYP):
+#'variables': {
+#'conditions': [
+#['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', {
+## Only enable the chromium linker on regular builds, since the
+## component build crashes on Android 4.4. See b/11379966
+#'use_chromium_linker': '1',
+#}],
+#],
+#},
+
 }
 
 # GYP: //chrome/chrome_browser.gypi:chrome_sync_shell_apk
@@ -394,6 +395,101 @@ android_apk("chrome_sync_shell_apk") {
   asset_location = chrome_shell_assets_dir
 }
 
+# GYP: part of //chrome/chrome_tests.gypi:chrome_shell_test_apk
+android_library("chrome_javatests") {
+  testonly = true
+  DEPRECATED_java_in_dir = "javatests/src"
+  deps = [
+    ":chrome_java",
+    ":chrome_java_resources",
+    ":chrome_shell_java",
+    ":chrome_shell_resources",
+    ":chrome_shell_test_java",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//chrome/test/android:chrome_java_test_support",
+    "//components/bookmarks/common/android:bookmarks_java",
+    "//components/dom_distiller/android:dom_distiller_core_java",
+    "//components/invalidation:java",
+    "//content/public/android:content_java",
+    "//content/public/test/android:content_java_test_support",
+    "//printing:printing_java",
+    "//sync/android:sync_java",
+    "//sync:sync_java_test_support",
+    "//third_party/cacheinvalidation:cacheinvalidation_javalib",
+    "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
+    "//third_party/jsr-305:jsr_305_javalib",
+    "//ui/android:ui_java",
+  ]
+}
+
+android_library("chrome_shell_test_java") {
+  testonly = true
+  deps = [
+    ":chrome_java",
+    ":chrome_shell_java",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//chrome/test/android:chrome_java_test_support",
+    "//content/public/android:content_java",
+    "//content/public/test/android:content_java_test_support",
+    "//ui/android:ui_java",
+  ]
+  DEPRECATED_java_in_dir = "shell/javatests/src"
+}
+
+# GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk
+android_apk("chrome_shell_test_apk") {
+  testonly = true
+  deps = [
+    ":chrome_javatests",
+    ":chrome_shell_test_java",
+    "//sync/android:sync_javatests",
+  ]
+  apk_name = "ChromeShellTest"
+  android_manifest = "shell/javatests/AndroidManifest.xml"
+}
+
+# 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",
+  ]
+  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
+android_library("uiautomator_tests_java") {
+  testonly = true
+  DEPRECATED_java_in_dir = "uiautomator_tests/src"
+  deps = [
+    "//base:base_java_test_support",
+    "//third_party/android_tools:uiautomator_java",
+  ]
+}
+
+# GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests
+uiautomator_test("uiautomator_tests") {
+  testonly = true
+  deps = [
+    ":uiautomator_tests_java"
+  ]
+}
+
 # GYP: //chrome/chrome_android.gypi:chrome_version_java
 chrome_version_java_dir = "$root_gen_dir/templates/chrome_version_java"
 chrome_version_java_file = "$chrome_version_java_dir/org/chromium/chrome/browser/ChromeVersionConstants.java"