From ebf524007f47991c83073c5b54213d695be21bc1 Mon Sep 17 00:00:00 2001 From: sakal Date: Mon, 24 Oct 2016 00:28:01 -0700 Subject: [PATCH] Allow using Java classes that don't require JNI in Chromium. BUG=webrtc:6584 NOTRY=True Review-Url: https://codereview.webrtc.org/2439073002 Cr-Commit-Position: refs/heads/master@{#14730} --- webrtc/api/BUILD.gn | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn index 6424de96a6..9a286025d3 100644 --- a/webrtc/api/BUILD.gn +++ b/webrtc/api/BUILD.gn @@ -235,7 +235,10 @@ if (is_android && !build_with_chromium) { ] output_extension = "so" } +} +# Classes that don't require jni can be used in Chromium. +if (is_android) { android_library("libjingle_peerconnection_java") { java_files = [ "../modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java", @@ -302,7 +305,7 @@ if (is_android && !build_with_chromium) { ] deps = [ - "//webrtc/base:base_java", + "../base:base_java", ] } } @@ -475,8 +478,8 @@ if (rtc_include_tests) { deps = [ ":libjingle_peerconnection_android_unittest_resources", ":libjingle_peerconnection_java", + "../base:base_java", "//base:base_java", - "//webrtc/base:base_java", ] shared_libraries = [ ":libjingle_peerconnection_so" ]