From 40d224814a68bf90e5ab847df0105de2a89006e9 Mon Sep 17 00:00:00 2001 From: sakal Date: Thu, 18 May 2017 06:44:20 -0700 Subject: [PATCH] Revert of Removes usage of native base::android::GetApplicationContext() (patchset #6 id:120001 of https://codereview.webrtc.org/2888093004/ ) Reason for revert: Breaks bot on chromium.webrtc.fyi. Original issue's description: > Removes usage of native base::android::GetApplicationContext() > > BUG=webrtc:7665 > > Review-Url: https://codereview.webrtc.org/2888093004 > Cr-Commit-Position: refs/heads/master@{#18195} > Committed: https://chromium.googlesource.com/external/webrtc/+/bc83e2ee696ca3672b8cebd658672e95eec4e465 TBR=magjed@webrtc.org,henrika@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7665 Review-Url: https://codereview.webrtc.org/2894593002 Cr-Commit-Position: refs/heads/master@{#18196} --- webrtc/base/BUILD.gn | 1 - .../java/src/org/webrtc/ContextUtils.java | 42 ----------------- .../audio_device/android/audio_manager.cc | 9 ++-- .../audio_device/android/audio_record_jni.cc | 9 ++-- .../audio_device/android/audio_track_jni.cc | 9 ++-- .../android/ensure_initialized.cc | 5 +- .../voiceengine/WebRtcAudioManager.java | 17 +++---- .../webrtc/voiceengine/WebRtcAudioRecord.java | 8 ++-- .../webrtc/voiceengine/WebRtcAudioTrack.java | 8 ++-- webrtc/modules/utility/include/jvm_android.h | 11 +++-- webrtc/modules/utility/source/jvm_android.cc | 9 ++-- webrtc/pc/test/androidtestinitializer.cc | 4 +- .../api/org/webrtc/PeerConnectionFactory.java | 13 ++---- .../sdk/android/src/jni/peerconnection_jni.cc | 4 +- webrtc/test/BUILD.gn | 14 ------ webrtc/test/android/AndroidManifest.xml | 46 ------------------- .../webrtc/native_test/RTCNativeUnitTest.java | 26 ----------- .../RTCNativeUnitTestActivity.java | 34 -------------- webrtc/webrtc.gni | 4 -- 19 files changed, 54 insertions(+), 219 deletions(-) delete mode 100644 webrtc/base/java/src/org/webrtc/ContextUtils.java delete mode 100644 webrtc/test/android/AndroidManifest.xml delete mode 100644 webrtc/test/android/org/webrtc/native_test/RTCNativeUnitTest.java delete mode 100644 webrtc/test/android/org/webrtc/native_test/RTCNativeUnitTestActivity.java diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn index e94169d0ce..45f0718402 100644 --- a/webrtc/base/BUILD.gn +++ b/webrtc/base/BUILD.gn @@ -979,7 +979,6 @@ if (rtc_include_tests) { if (is_android) { android_library("base_java") { java_files = [ - "java/src/org/webrtc/ContextUtils.java", "java/src/org/webrtc/Logging.java", "java/src/org/webrtc/Size.java", "java/src/org/webrtc/ThreadUtils.java", diff --git a/webrtc/base/java/src/org/webrtc/ContextUtils.java b/webrtc/base/java/src/org/webrtc/ContextUtils.java deleted file mode 100644 index 3b9a652fed..0000000000 --- a/webrtc/base/java/src/org/webrtc/ContextUtils.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -package org.webrtc; - -import android.content.Context; - -/** - * Class for storing the application context and retrieving it in a static context. Similar to - * org.chromium.base.ContextUtils. - */ -public class ContextUtils { - private static Context applicationContext; - - /** - * Stores the application context that will be returned by getApplicationContext. This is called - * by PeerConnectionFactory.initializeAndroidGlobals. - */ - public static void initialize(Context applicationContext) { - if (ContextUtils.applicationContext != null) { - throw new RuntimeException("Multiple ContextUtils.initialize calls."); - } - if (applicationContext == null) { - throw new RuntimeException("Application context cannot be null for ContextUtils.initialize."); - } - ContextUtils.applicationContext = applicationContext; - } - - /** - * Returns the stored application context. - */ - public static Context getApplicationContext() { - return applicationContext; - } -} diff --git a/webrtc/modules/audio_device/android/audio_manager.cc b/webrtc/modules/audio_device/android/audio_manager.cc index d56e9c1bef..6925c3d614 100644 --- a/webrtc/modules/audio_device/android/audio_manager.cc +++ b/webrtc/modules/audio_device/android/audio_manager.cc @@ -83,10 +83,11 @@ AudioManager::AudioManager() j_native_registration_ = j_environment_->RegisterNatives( "org/webrtc/voiceengine/WebRtcAudioManager", native_methods, arraysize(native_methods)); - j_audio_manager_.reset( - new JavaAudioManager(j_native_registration_.get(), - j_native_registration_->NewObject( - "", "(J)V", PointerTojlong(this)))); + j_audio_manager_.reset(new JavaAudioManager( + j_native_registration_.get(), + j_native_registration_->NewObject( + "", "(Landroid/content/Context;J)V", + JVM::GetInstance()->context(), PointerTojlong(this)))); } AudioManager::~AudioManager() { diff --git a/webrtc/modules/audio_device/android/audio_record_jni.cc b/webrtc/modules/audio_device/android/audio_record_jni.cc index 2a9eacf838..b826ef6883 100644 --- a/webrtc/modules/audio_device/android/audio_record_jni.cc +++ b/webrtc/modules/audio_device/android/audio_record_jni.cc @@ -90,10 +90,11 @@ AudioRecordJni::AudioRecordJni(AudioManager* audio_manager) j_native_registration_ = j_environment_->RegisterNatives( "org/webrtc/voiceengine/WebRtcAudioRecord", native_methods, arraysize(native_methods)); - j_audio_record_.reset( - new JavaAudioRecord(j_native_registration_.get(), - j_native_registration_->NewObject( - "", "(J)V", PointerTojlong(this)))); + j_audio_record_.reset(new JavaAudioRecord( + j_native_registration_.get(), + j_native_registration_->NewObject( + "", "(Landroid/content/Context;J)V", + JVM::GetInstance()->context(), PointerTojlong(this)))); // Detach from this thread since we want to use the checker to verify calls // from the Java based audio thread. thread_checker_java_.DetachFromThread(); diff --git a/webrtc/modules/audio_device/android/audio_track_jni.cc b/webrtc/modules/audio_device/android/audio_track_jni.cc index 83c01c969a..72e056f368 100644 --- a/webrtc/modules/audio_device/android/audio_track_jni.cc +++ b/webrtc/modules/audio_device/android/audio_track_jni.cc @@ -89,10 +89,11 @@ AudioTrackJni::AudioTrackJni(AudioManager* audio_manager) j_native_registration_ = j_environment_->RegisterNatives( "org/webrtc/voiceengine/WebRtcAudioTrack", native_methods, arraysize(native_methods)); - j_audio_track_.reset( - new JavaAudioTrack(j_native_registration_.get(), - j_native_registration_->NewObject( - "", "(J)V", PointerTojlong(this)))); + j_audio_track_.reset(new JavaAudioTrack( + j_native_registration_.get(), + j_native_registration_->NewObject( + "", "(Landroid/content/Context;J)V", + JVM::GetInstance()->context(), PointerTojlong(this)))); // Detach from this thread since we want to use the checker to verify calls // from the Java based audio thread. thread_checker_java_.DetachFromThread(); diff --git a/webrtc/modules/audio_device/android/ensure_initialized.cc b/webrtc/modules/audio_device/android/ensure_initialized.cc index a24d53535f..9bc08ab196 100644 --- a/webrtc/modules/audio_device/android/ensure_initialized.cc +++ b/webrtc/modules/audio_device/android/ensure_initialized.cc @@ -17,7 +17,7 @@ // Note: this dependency is dangerous since it reaches into Chromium's base. // There's a risk of e.g. macro clashes. This file may only be used in tests. RTC_PUSH_IGNORING_WUNDEF() -// #include "base/android/context_utils.h" +#include "base/android/context_utils.h" #include "base/android/jni_android.h" RTC_POP_IGNORING_WUNDEF() #include "webrtc/base/checks.h" @@ -35,9 +35,10 @@ void EnsureInitializedOnce() { JNIEnv* jni = ::base::android::AttachCurrentThread(); JavaVM* jvm = NULL; RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm)); + jobject context = ::base::android::GetApplicationContext().obj(); // Initialize the Java environment (currently only used by the audio manager). - webrtc::JVM::Initialize(jvm); + webrtc::JVM::Initialize(jvm, context); } void EnsureInitialized() { diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java index 76ec4c5ede..24b8ab8340 100644 --- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java +++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java @@ -20,7 +20,6 @@ import android.media.AudioTrack; import android.os.Build; import java.util.Timer; import java.util.TimerTask; -import org.webrtc.ContextUtils; import org.webrtc.Logging; // WebRtcAudioManager handles tasks that uses android.media.AudioManager. @@ -136,6 +135,7 @@ public class WebRtcAudioManager { } private final long nativeAudioManager; + private final Context context; private final AudioManager audioManager; private boolean initialized = false; @@ -156,11 +156,11 @@ public class WebRtcAudioManager { private final VolumeLogger volumeLogger; - WebRtcAudioManager(long nativeAudioManager) { + WebRtcAudioManager(Context context, long nativeAudioManager) { Logging.d(TAG, "ctor" + WebRtcAudioUtils.getThreadInfo()); + this.context = context; this.nativeAudioManager = nativeAudioManager; - audioManager = - (AudioManager) ContextUtils.getApplicationContext().getSystemService(Context.AUDIO_SERVICE); + audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); if (DEBUG) { WebRtcAudioUtils.logDeviceInfo(TAG); } @@ -224,14 +224,12 @@ public class WebRtcAudioManager { // Gets the current earpiece state. private boolean hasEarpiece() { - return ContextUtils.getApplicationContext().getPackageManager().hasSystemFeature( - PackageManager.FEATURE_TELEPHONY); + return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY); } // Returns true if low-latency audio output is supported. private boolean isLowLatencyOutputSupported() { - return ContextUtils.getApplicationContext().getPackageManager().hasSystemFeature( - PackageManager.FEATURE_AUDIO_LOW_LATENCY); + return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUDIO_LOW_LATENCY); } // Returns true if low-latency audio input is supported. @@ -250,8 +248,7 @@ public class WebRtcAudioManager { @TargetApi(23) private boolean isProAudioSupported() { return WebRtcAudioUtils.runningOnMarshmallowOrHigher() - && ContextUtils.getApplicationContext().getPackageManager().hasSystemFeature( - PackageManager.FEATURE_AUDIO_PRO); + && context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUDIO_PRO); } // Returns the native output sample rate for this device's output stream. diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java index ba93ea1fb2..762a903f0d 100644 --- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java +++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java @@ -19,7 +19,6 @@ import android.os.Process; import java.lang.System; import java.nio.ByteBuffer; import java.util.concurrent.TimeUnit; -import org.webrtc.ContextUtils; import org.webrtc.Logging; import org.webrtc.ThreadUtils; @@ -48,6 +47,7 @@ public class WebRtcAudioRecord { private static final long AUDIO_RECORD_THREAD_JOIN_TIMEOUT_MS = 2000; private final long nativeAudioRecord; + private final Context context; private WebRtcAudioEffects effects = null; @@ -139,8 +139,9 @@ public class WebRtcAudioRecord { } } - WebRtcAudioRecord(long nativeAudioRecord) { + WebRtcAudioRecord(Context context, long nativeAudioRecord) { Logging.d(TAG, "ctor" + WebRtcAudioUtils.getThreadInfo()); + this.context = context; this.nativeAudioRecord = nativeAudioRecord; if (DEBUG) { WebRtcAudioUtils.logDeviceInfo(TAG); @@ -168,8 +169,7 @@ public class WebRtcAudioRecord { private int initRecording(int sampleRate, int channels) { Logging.d(TAG, "initRecording(sampleRate=" + sampleRate + ", channels=" + channels + ")"); - if (!WebRtcAudioUtils.hasPermission( - ContextUtils.getApplicationContext(), android.Manifest.permission.RECORD_AUDIO)) { + if (!WebRtcAudioUtils.hasPermission(context, android.Manifest.permission.RECORD_AUDIO)) { reportWebRtcAudioRecordInitError("RECORD_AUDIO permission is missing"); return -1; } diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java index 796a0821c5..65c52077c8 100644 --- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java +++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java @@ -19,7 +19,6 @@ import android.media.AudioTrack; import android.os.Process; import java.lang.Thread; import java.nio.ByteBuffer; -import org.webrtc.ContextUtils; import org.webrtc.Logging; public class WebRtcAudioTrack { @@ -37,6 +36,7 @@ public class WebRtcAudioTrack { // Average number of callbacks per second. private static final int BUFFERS_PER_SECOND = 1000 / CALLBACK_BUFFER_SIZE_MS; + private final Context context; private final long nativeAudioTrack; private final AudioManager audioManager; @@ -165,11 +165,11 @@ public class WebRtcAudioTrack { } } - WebRtcAudioTrack(long nativeAudioTrack) { + WebRtcAudioTrack(Context context, long nativeAudioTrack) { Logging.d(TAG, "ctor" + WebRtcAudioUtils.getThreadInfo()); + this.context = context; this.nativeAudioTrack = nativeAudioTrack; - audioManager = - (AudioManager) ContextUtils.getApplicationContext().getSystemService(Context.AUDIO_SERVICE); + audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); if (DEBUG) { WebRtcAudioUtils.logDeviceInfo(TAG); } diff --git a/webrtc/modules/utility/include/jvm_android.h b/webrtc/modules/utility/include/jvm_android.h index f21d65aaf9..51a0bd841a 100644 --- a/webrtc/modules/utility/include/jvm_android.h +++ b/webrtc/modules/utility/include/jvm_android.h @@ -118,7 +118,8 @@ class JNIEnvironment { // JNIEnv* jni = ::base::android::AttachCurrentThread(); // JavaVM* jvm = NULL; // jni->GetJavaVM(&jvm); -// webrtc::JVM::Initialize(jvm); +// jobject context = ::base::android::GetApplicationContext(); +// webrtc::JVM::Initialize(jvm, context); // // // Header (.h) file of example class called User. // std::unique_ptr env; @@ -144,9 +145,9 @@ class JNIEnvironment { // JVM::Uninitialize(); class JVM { public: - // Stores global handles to the Java VM interface. + // Stores global handles to the Java VM interface and the application context. // Should be called once on a thread that is attached to the JVM. - static void Initialize(JavaVM* jvm); + static void Initialize(JavaVM* jvm, jobject context); // Clears handles stored in Initialize(). Must be called on same thread as // Initialize(). static void Uninitialize(); @@ -167,9 +168,10 @@ class JVM { // TODO(henrika): can we make these private? JavaVM* jvm() const { return jvm_; } + jobject context() const { return context_; } protected: - JVM(JavaVM* jvm); + JVM(JavaVM* jvm, jobject context); ~JVM(); private: @@ -177,6 +179,7 @@ class JVM { rtc::ThreadChecker thread_checker_; JavaVM* const jvm_; + jobject context_; }; } // namespace webrtc diff --git a/webrtc/modules/utility/source/jvm_android.cc b/webrtc/modules/utility/source/jvm_android.cc index 2228d3ad25..9d08688700 100644 --- a/webrtc/modules/utility/source/jvm_android.cc +++ b/webrtc/modules/utility/source/jvm_android.cc @@ -217,10 +217,10 @@ std::string JNIEnvironment::JavaToStdString(const jstring& j_string) { } // static -void JVM::Initialize(JavaVM* jvm) { +void JVM::Initialize(JavaVM* jvm, jobject context) { ALOGD("JVM::Initialize%s", GetThreadInfo().c_str()); RTC_CHECK(!g_jvm); - g_jvm = new JVM(jvm); + g_jvm = new JVM(jvm, context); } // static @@ -237,9 +237,11 @@ JVM* JVM::GetInstance() { return g_jvm; } -JVM::JVM(JavaVM* jvm) : jvm_(jvm) { +JVM::JVM(JavaVM* jvm, jobject context) + : jvm_(jvm) { ALOGD("JVM::JVM%s", GetThreadInfo().c_str()); RTC_CHECK(jni()) << "AttachCurrentThread() must be called on this thread."; + context_ = NewGlobalRef(jni(), context); LoadClasses(jni()); } @@ -247,6 +249,7 @@ JVM::~JVM() { ALOGD("JVM::~JVM%s", GetThreadInfo().c_str()); RTC_DCHECK(thread_checker_.CalledOnValidThread()); FreeClassReferences(jni()); + DeleteGlobalRef(jni(), context_); } std::unique_ptr JVM::environment() { diff --git a/webrtc/pc/test/androidtestinitializer.cc b/webrtc/pc/test/androidtestinitializer.cc index f070104177..3f2ebd4c3b 100644 --- a/webrtc/pc/test/androidtestinitializer.cc +++ b/webrtc/pc/test/androidtestinitializer.cc @@ -19,6 +19,7 @@ // Since we use Chromes build system for creating the gtest binary, this should // be fine. RTC_PUSH_IGNORING_WUNDEF() +#include "base/android/context_utils.h" #include "base/android/jni_android.h" RTC_POP_IGNORING_WUNDEF() @@ -40,10 +41,11 @@ void EnsureInitializedOnce() { JNIEnv* jni = ::base::android::AttachCurrentThread(); JavaVM* jvm = NULL; RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm)); + jobject context = ::base::android::GetApplicationContext().obj(); RTC_CHECK(rtc::InitializeSSL()) << "Failed to InitializeSSL()"; - webrtc::JVM::Initialize(jvm); + webrtc::JVM::Initialize(jvm, context); } } // anonymous namespace diff --git a/webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java b/webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java index b7d85f04e3..28b3ca72ab 100644 --- a/webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java +++ b/webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java @@ -10,7 +10,6 @@ package org.webrtc; -import android.content.Context; import java.util.List; /** @@ -31,7 +30,6 @@ public class PeerConnectionFactory { private static final String TAG = "PeerConnectionFactory"; private final long nativeFactory; - private static Context applicationContext; private static Thread networkThread; private static Thread workerThread; private static Thread signalingThread; @@ -54,19 +52,14 @@ public class PeerConnectionFactory { // Must be called at least once before creating a PeerConnectionFactory // (for example, at application startup time). - public static native void nativeInitializeAndroidGlobals( - Context context, boolean videoHwAcceleration); - - public static void initializeAndroidGlobals(Context context, boolean videoHwAcceleration) { - ContextUtils.initialize(context); - nativeInitializeAndroidGlobals(context, videoHwAcceleration); - } + public static native void initializeAndroidGlobals( + android.content.Context context, boolean videoHwAcceleration); // Older signature of initializeAndroidGlobals. The extra parameters are now meaningless. @Deprecated public static boolean initializeAndroidGlobals(Object context, boolean initializeAudio, boolean initializeVideo, boolean videoHwAcceleration) { - initializeAndroidGlobals((Context) context, videoHwAcceleration); + initializeAndroidGlobals((android.content.Context) context, videoHwAcceleration); return true; } diff --git a/webrtc/sdk/android/src/jni/peerconnection_jni.cc b/webrtc/sdk/android/src/jni/peerconnection_jni.cc index 04090f8b61..c07d58faff 100644 --- a/webrtc/sdk/android/src/jni/peerconnection_jni.cc +++ b/webrtc/sdk/android/src/jni/peerconnection_jni.cc @@ -1136,7 +1136,7 @@ JOW(jlong, PeerConnectionFactory_nativeCreateObserver)( return (jlong)new PCOJava(jni, j_observer); } -JOW(void, PeerConnectionFactory_nativeInitializeAndroidGlobals) +JOW(void, PeerConnectionFactory_initializeAndroidGlobals) (JNIEnv* jni, jclass, jobject context, @@ -1146,7 +1146,7 @@ JOW(void, PeerConnectionFactory_nativeInitializeAndroidGlobals) if (!factory_static_initialized) { RTC_DCHECK(j_application_context == nullptr); j_application_context = NewGlobalRef(jni, context); - webrtc::JVM::Initialize(GetJVM()); + webrtc::JVM::Initialize(GetJVM(), context); factory_static_initialized = true; } } diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn index a0d262b165..aa6f322313 100644 --- a/webrtc/test/BUILD.gn +++ b/webrtc/test/BUILD.gn @@ -532,17 +532,3 @@ rtc_source_set("audio_codec_mocks") { "//testing/gmock", ] } - -if (is_android) { - android_library("native_test_java") { - testonly = true - java_files = [ - "android/org/webrtc/native_test/RTCNativeUnitTest.java", - "android/org/webrtc/native_test/RTCNativeUnitTestActivity.java", - ] - deps = [ - "//testing/android/native_test:native_test_java", - "//webrtc/base:base_java", - ] - } -} diff --git a/webrtc/test/android/AndroidManifest.xml b/webrtc/test/android/AndroidManifest.xml deleted file mode 100644 index b5157a75df..0000000000 --- a/webrtc/test/android/AndroidManifest.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webrtc/test/android/org/webrtc/native_test/RTCNativeUnitTest.java b/webrtc/test/android/org/webrtc/native_test/RTCNativeUnitTest.java deleted file mode 100644 index dede7edd1f..0000000000 --- a/webrtc/test/android/org/webrtc/native_test/RTCNativeUnitTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -package org.webrtc.native_test; - -import android.app.Activity; -import org.chromium.native_test.NativeUnitTest; -import org.webrtc.ContextUtils; - -/** - * Native unit test that calls ContextUtils.initialize for WebRTC. - */ -public class RTCNativeUnitTest extends NativeUnitTest { - @Override - public void preCreate(Activity activity) { - super.preCreate(activity); - ContextUtils.initialize(activity.getApplicationContext()); - } -} diff --git a/webrtc/test/android/org/webrtc/native_test/RTCNativeUnitTestActivity.java b/webrtc/test/android/org/webrtc/native_test/RTCNativeUnitTestActivity.java deleted file mode 100644 index 2a413682fe..0000000000 --- a/webrtc/test/android/org/webrtc/native_test/RTCNativeUnitTestActivity.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -package org.webrtc.native_test; - -import android.app.Activity; -import android.os.Bundle; - -/** - * Activity that uses RTCNativeUnitTest to run the tests. - */ -public class RTCNativeUnitTestActivity extends Activity { - private RTCNativeUnitTest mTest = new RTCNativeUnitTest(); - - @Override - public void onCreate(Bundle savedInstanceState) { - mTest.preCreate(this); - super.onCreate(savedInstanceState); - mTest.postCreate(this); - } - - @Override - public void onStart() { - super.onStart(); - mTest.postStart(this, false); - } -} diff --git a/webrtc/webrtc.gni b/webrtc/webrtc.gni index b3ba9b0101..5e1c12dd3f 100644 --- a/webrtc/webrtc.gni +++ b/webrtc/webrtc.gni @@ -266,10 +266,6 @@ template("rtc_test") { if (defined(invoker.public_configs)) { public_configs += invoker.public_configs } - if (is_android) { - android_manifest = "//webrtc/test/android/AndroidManifest.xml" - deps += [ "//webrtc/test:native_test_java" ] - } } }