blimp: Move BlimpCompositor to use delegated rendering.

blimp/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # 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
   # cannot depend on this one, and that it can depend on test targets,
   # which fits how we intend to use it.
   testonly = true
 
   deps = [
     ":blimp_tests",
     "//blimp/client",
@@ skipping 47 matching lines @@
     "//blimp/client:feature_unit_tests",
     "//blimp/client/core:unit_tests",
     "//blimp/common:unit_tests",
     "//blimp/net:unit_tests",
     "//blimp/test:run_all_unittests",
   ]
 
   if (is_linux) {
     deps += [ "//blimp/engine:unit_tests" ]
   }
+
+  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.
+  # While we could directly include them in the test target, but in order to

[David Trainor- moved to gerrit, 2016/08/23 16:43:39]

Fix wording a bit.  Remove "While"?

[Khushal, 2016/08/24 16:13:43]

Done.

+  # 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 = [ ":*" ]

[David Trainor- moved to gerrit, 2016/08/23 16:43:39]

Can we be explicit about visibility here since the comment seems pretty explicit
about who should depend on this?

[Khushal, 2016/08/24 16:13:43]

That's the thing, since the real target that has to depend on this is generated
it ends up *blimp_unittest* and we can't do that when specifying gn targets. And
since this is testonly, even with everything in this file depending on it, we
figured its reasonable.

+
+    deps = [
+      "//base:base_java",
+      "//blimp/client/core:core_java",
+      "//net/android:net_java",
+      "//ui/android:ui_java",
+    ]
+  }
 }
 
 if (is_linux) {
   test("blimp_browsertests") {
     deps = [
       "//blimp/engine:browser_tests",
     ]
   }
 
   _blimp_engine_env_tests_runtime_deps =
@@ skipping 119 matching lines @@
       "--output",
       rebase_path(_output_path, root_build_dir),
       "--target",
       rebase_path(_wrapped_script, root_build_dir),
       "--output-directory",
       rebase_path(root_out_dir, root_build_dir),
       "--flag-name=--output-linux-directory",
     ]
   }
 }