From 93fa232bbc3784aea624d2a554d558cb6ad21ca0 Mon Sep 17 00:00:00 2001
From: pkotwicz <pkotwicz@chromium.org>
Date: Wed, 11 Nov 2015 09:55:07 -0800
Subject: Make components_browsertests work in GN

BUG=510485

Review URL: https://codereview.chromium.org/1408353012

Cr-Commit-Position: refs/heads/master@{#359111}
---
 testing/android/native_test.gyp      |  1 +
 testing/android/native_test/BUILD.gn | 13 +++++++++++++
 testing/test.gni                     |  6 +++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'testing')

diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index 5c30a50..b6fed86 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -51,6 +51,7 @@
           ],
         },
         {
+          # GN: //testing/android/native_test:native_test_java
           'target_name': 'native_test_java',
           'type': 'none',
           'dependencies': [
diff --git a/testing/android/native_test/BUILD.gn b/testing/android/native_test/BUILD.gn
index 0e8ffcb..34c5906 100644
--- a/testing/android/native_test/BUILD.gn
+++ b/testing/android/native_test/BUILD.gn
@@ -35,6 +35,19 @@ source_set("native_test_native_code") {
   ]
 }
 
+# GYP: //testing/android/native_test.gyp:native_test_java
+android_library("native_test_java") {
+  testonly = true
+  deps = [
+    "//base:base_java",
+    "//testing/android/appurify_support:appurify_support_java",
+    "//testing/android/reporter:reporter_java",
+  ]
+  srcjar_deps = [ "//base:base_native_libraries_gen" ]
+  DEPRECATED_java_in_dir = "java/src"
+  jar_excluded_patterns = [ "*/NativeLibraries.class" ]
+}
+
 # GYP: //testing/android/native_test.gyp:native_test_jni_headers
 generate_jni("native_test_jni_headers") {
   sources = [
diff --git a/testing/test.gni b/testing/test.gni
index 449abd8..a6daf7e 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -54,7 +54,8 @@ template("test") {
                              ])
 
       deps = []
-      if (!defined(invoker.use_launcher) || invoker.use_launcher) {
+      if (!defined(invoker.use_default_launcher) ||
+          invoker.use_default_launcher) {
         deps += [ "//testing/android/native_test:native_test_native_code" ]
       }
       if (defined(invoker.deps)) {
@@ -81,6 +82,9 @@ template("test") {
       if (defined(invoker.android_manifest)) {
         android_manifest = invoker.android_manifest
       }
+      if (defined(invoker.use_default_launcher)) {
+        use_default_launcher = invoker.use_default_launcher
+      }
     }
 
     _test_name = main_target_name
-- 
cgit v1.1