Move session into //blimp/client/app and update GN files.

blimp/BUILD.gn

Index: blimp/BUILD.gn
diff --git a/blimp/BUILD.gn b/blimp/BUILD.gn
index 8410796e765c1d4caadbf6a11936fc2545ac9a69..39ff707e380bc453e851890d00e25890f4d99a88 100644
--- a/blimp/BUILD.gn
+++ b/blimp/BUILD.gn
@@ -3,14 +3,8 @@
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
-import("//build/config/ui.gni")
 import("//testing/test.gni")
 
-if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
-}
-
 # Convenience meta-target for all of Blimp's production & test code.
 group("blimp") {
   # In spite of the name, this really just means that non-test targets
@@ -24,13 +18,6 @@ group("blimp") {
     "//blimp/common",
   ]
 
-  if (is_android) {
-    deps += [
-      "//blimp/client:blimp_apk",
-      "//blimp/client:blimp_apk_incremental",
-    ]
-  }
-
   if (is_linux) {
     deps += [
       ":client_engine_integration",
@@ -42,24 +29,17 @@ group("blimp") {
       deps += [ "//blimp/engine:blimp_symbols" ]
     }
   }
-
-  if (is_linux && !is_chromeos && use_x11) {
-    deps += [ "//blimp/client:blimp_shell" ]
-  }
 }
 
-# Builds all Blimp test code (unit tests, APKs).
+# Builds all Blimp test code (unit tests, test APKs).
 group("blimp_tests") {
   testonly = true
 
   deps = [
     ":blimp_unittests",
+    "//blimp/client:test_binaries",
   ]
 
-  if (is_android) {
-    deps += [ "//blimp/client:blimp_test_apk" ]
-  }
-
   if (is_linux) {
     deps += [ ":blimp_browsertests" ]
   }
@@ -67,8 +47,7 @@ group("blimp_tests") {
 
 test("blimp_unittests") {
   deps = [
-    "//blimp/client:app_unit_tests",
-    "//blimp/client/core:unit_tests",
+    "//blimp/client:unit_tests",
     "//blimp/common:unit_tests",
     "//blimp/net:unit_tests",
     "//blimp/test:run_all_unittests",
@@ -79,32 +58,7 @@ test("blimp_unittests") {
   }
 
   if (is_android) {
-    deps += [ ":blimp_unittests_java_deps" ]
-  }
-}
-
-if (is_android) {
-  # This is the list of targets that the tests need to depend on in order to add
-  # the java classes for their native counterparts to the test apk.
-  # We could directly include them in the test target, but in order to
-  # keep the visibility of the //blimp/client/core:core_java target restricted,
-  # we make it visible to this group (which is testonly) and depend on this
-  # group instead.
-  # We could not add ":blimp_unittests" to the visibility list of
-  # //blimp/client/core:core_java, since the targets that actually need to
-  # depend on it are generated by the test template (see testing/test.gni). So
-  # it was better to add this indirection and expose it to this testonly target,
-  # which can be used in this file only.
-  java_group("blimp_unittests_java_deps") {
-    testonly = true
-    visibility = [ ":*" ]
-
-    deps = [
-      "//base:base_java",
-      "//blimp/client/core:core_java",
-      "//net/android:net_java",
-      "//ui/android:ui_java",
-    ]
+    deps += [ "//blimp/client:blimp_unittests_java_deps" ]
   }
 }