[Android] Fix gn build for instrumentation tests.

tools/android/forwarder2/BUILD.gn

+# Copyright 2014 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.
+
+# GYP: //tools/android/forwarder2/forwarder.gyp:forwarder2
+group("forwarder2") {
+  datadeps = [
+    ":host_forwarder($host_toolchain)",
+    ":host_forwarder_copy($host_toolchain)",
+    ":device_forwarder($default_toolchain)",
+    ":device_forwarder_prepare_dist($default_toolchain)",
+  ]
+}
+
+# GYP: //tools/android/forwarder2/forwarder.gyp:device_forwarder
+executable("device_forwarder") {

[cjhopman, 2014/10/29 17:21:24]

This can probably go in the current_toolchain==default_toolchain block. we don't
need it for the host.

and then the host one can go in the host-only block.

[qsr, 2014/10/30 12:15:53]

Done.

+  sources = [
+    "command.cc",

[cjhopman, 2014/10/29 17:21:24]

looks like headers are missing here and below

[qsr, 2014/10/30 12:15:53]

Done.

+    "common.cc",
+    "daemon.cc",
+    "device_controller.cc",
+    "device_forwarder_main.cc",
+    "device_listener.cc",
+    "forwarder.cc",
+    "forwarders_manager.cc",
+    "pipe_notifier.cc",
+    "socket.cc",
+  ]
+  deps = [
+    "//base",
+    "//tools/android/common",
+  ]
+  datadeps = [
+    "//build/android/pylib/device/commands",
+  ]
+}
+
+if (current_toolchain == default_toolchain) {
+  import("//build/config/android/rules.gni")
+
+  # GYP: //tools/android/forwarder2/forwarder.gyp:forwarder2
+  create_native_executable_dist("device_forwarder_prepare_dist") {
+    dist_dir = "$root_build_dir/forwarder_dist"
+    binary = "$root_build_dir/exe.stripped/device_forwarder"
+  }
+}
+
+# GYP: //tools/android/forwarder2/forwarder.gyp:host_forwarder
+executable("host_forwarder") {
+  sources = [
+    "command.cc",
+    "common.cc",
+    "daemon.cc",
+    "forwarder.cc",
+    "forwarders_manager.cc",
+    "host_controller.cc",
+    "host_forwarder_main.cc",
+    "pipe_notifier.cc",
+    "socket.cc",
+  ]
+  deps = [
+    "//base",
+    "//tools/android/common",
+  ]
+}
+
+if (current_toolchain != default_toolchain) {
+  # GYP: //tools/android/forwarder2/forwarder.gyp:forwarder2
+  copy("host_forwarder_copy") {
+    sources = ["$root_out_dir/host_forwarder"]
+    outputs = ["$root_build_dir/host_forwarder"]
+  }
+}