commit 78498cf5eee894b08baf937e00bda46ec2e49c22
author Sami Kalliomäki <sakal@webrtc.org> Wed Feb 07 16:59:33 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Fri Feb 09 10:34:44 2018 +0000
tree 9140c0b0ed82786dcb7be7a386324d8114eec3d4
parent 1bc1ec43a3ad84001e1fc4497b92d89c64f24a38

Implements JavaToNativeStringMap and adds tests for native API.

Implements JavaToNativeStringMap that is a replacement for
JavaToStdMapStrings. It uses a new template method JavaToNativeMap. Also
adds testing support for native API and a test for JavaToNativeStringMap.

Bug: webrtc:8769
Change-Id: I580d4992a899ebe02da39af450fa51d52ee9b88b
Reviewed-on: https://webrtc-review.googlesource.com/48060
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21967}

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 45069a4..10be0ca 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -446,7 +446,14 @@
     }
 
     if (is_android) {
-      deps += [ "//testing/android/native_test:native_test_support" ]
+      # Do not use Chromium's launcher. native_unittests defines its own JNI_OnLoad.
+      use_default_launcher = false
+
+      deps += [
+        "sdk/android:native_unittests",
+        "sdk/android:native_unittests_java",
+        "//testing/android/native_test:native_test_support",
+      ]
       shard_timeout = 900
     }