Make remoting_unittests work on GN & Android

remoting/BUILD.gn

Index: remoting/BUILD.gn
diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn
index 15a65a93334a1facaac25a949ef940baec83b79a..2aee690b047328580a8b0627e5a8aab577ef5ae2 100644
--- a/remoting/BUILD.gn
+++ b/remoting/BUILD.gn
@@ -45,7 +45,6 @@ group("remoting_all") {
     deps += [
       #"//remoting:remoting_apk",
       #"//remoting:remoting_test_apk",
-      #"//remoting:remoting_unittests_apk",

[Lambros, 2015/11/24 19:12:45]

I guess the convention is that commented-out lines refer to GYP targets that
aren't yet enabled for GN. Removing this line signifies that you're enabling
remoting_unittests_apk for GN, but I don't see where that target is enabled or
defined.

[pkotwicz, 2015/11/24 20:35:29]

On Android, the test() template generates the _apk target. The test() template
can only be used for gtests.

See
https://code.google.com/p/chromium/codesearch#chromium/src/testing/test.gni&l=18

[Lambros, 2015/11/24 23:45:40]

Acknowledged.

     ]
   }
 
@@ -142,10 +141,6 @@ if (!is_mac) {
       "//third_party/webrtc",
     ]
 
-    if (is_android) {
-      deps += [ "//testing/android/native_test:native_test_native_code" ]

[Lambros, 2015/11/24 19:12:45]

Is this removed, because the net_java "apk_deps" line somehow brings this in
transitively?

[pkotwicz, 2015/11/24 20:35:29]

The test() template always adds in this dependency. See
https://code.google.com/p/chromium/codesearch#chromium/src/testing/test.gni&l=59

(The remote_unittests target does not define the "use_default_launcher"
variable)

[Lambros, 2015/11/24 23:45:40]

Acknowledged.

-    }
-
     if (enable_remoting_host) {
       deps += [
         "//remoting/codec:unit_tests",
@@ -160,6 +155,10 @@ if (!is_mac) {
         "//third_party/libjingle:libpeerconnection",
       ]
     }
+
+    if (is_android) {
+      apk_deps = [ "//net/android:net_java" ]

[Lambros, 2015/11/24 19:12:45]

I don't understand this. There aren't any Android GN targets in this file, are
there? So who uses apk_deps?

[pkotwicz, 2015/11/24 20:35:29]

The test() template automatically generates the "_apk" target.

"apk_deps" is very weird. I do not know why "apk_deps" is separate from "deps"

"apk_deps" must be provided because the native code calls into Java on Android.
All Java dependencies for test() targets must be included via "apk_deps" in the
test() target. The dependencies specified via "apk_deps" are the only ones which
are forwarded to the unittest_apk() target as per
https://code.google.com/p/chromium/codesearch#chromium/src/testing/test.gni&l=77

Using deps for Java dependencies works for android_apk() targets. "apk_deps" is
not a valid parameter for android_apk().

[Lambros, 2015/11/24 23:45:40]

Acknowledged.

+    }
   }
 
   if (enable_remoting_host) {