commit d7fdb8014d71e669618c675b2c29c6dfe7d426d3
author sakal <sakal@webrtc.org> Fri May 26 01:51:53 2017 -0700
committer Commit bot <commit-bot@chromium.org> Fri May 26 08:51:53 2017 +0000
tree 42a874110baf1503f2016429365e153ff4d43aef
parent 13ae11a4184c9e1b8d3d68203d0e60365d49b403

Reland of Removes usage of native base::android::GetApplicationContext()

The change is now compatible with the old JVM::Initialize API. The
context is passed to the ContextUtils class when calling its deprecated
signature.

BUG=webrtc:7665
NOTRY=True # Only comment changes since the last patchset.

Review-Url: https://codereview.webrtc.org/2903253004
Cr-Commit-Position: refs/heads/master@{#18268}

webrtc/webrtc.gni

diff --git a/webrtc/webrtc.gni b/webrtc/webrtc.gni
index 745a665..d4acaf5 100644
--- a/webrtc/webrtc.gni
+++ b/webrtc/webrtc.gni
@@ -266,6 +266,10 @@
     if (defined(invoker.public_configs)) {
       public_configs += invoker.public_configs
     }
+    if (!build_with_chromium && is_android) {
+      android_manifest = "//webrtc/test/android/AndroidManifest.xml"
+      deps += [ "//webrtc/test:native_test_java" ]
+    }
   }
 }