Move ADM specific Android files into modules/audio_device/android/
- Move helpers_android.* and jvm_android.* from modules/utility/.
BUG=none
TBR=perkj@webrtc.org
Review-Url: https://codereview.webrtc.org/2533573002
Cr-Commit-Position: refs/heads/master@{#15253}
diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn
index 7a0bce0..41ca820 100644
--- a/webrtc/modules/audio_device/BUILD.gn
+++ b/webrtc/modules/audio_device/BUILD.gn
@@ -110,6 +110,10 @@
"android/audio_track_jni.h",
"android/build_info.cc",
"android/build_info.h",
+ "android/helpers_android.cc",
+ "android/helpers_android.h",
+ "android/jvm_android.cc",
+ "android/jvm_android.h",
"android/opensles_common.cc",
"android/opensles_common.h",
"android/opensles_player.cc",
diff --git a/webrtc/modules/audio_device/android/audio_manager.cc b/webrtc/modules/audio_device/android/audio_manager.cc
index 6925c3d..1081e7f 100644
--- a/webrtc/modules/audio_device/android/audio_manager.cc
+++ b/webrtc/modules/audio_device/android/audio_manager.cc
@@ -17,7 +17,7 @@
#include "webrtc/base/arraysize.h"
#include "webrtc/base/checks.h"
#include "webrtc/modules/audio_device/android/audio_common.h"
-#include "webrtc/modules/utility/include/helpers_android.h"
+#include "webrtc/modules/audio_device/android/helpers_android.h"
#define TAG "AudioManager"
#define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__)
diff --git a/webrtc/modules/audio_device/android/audio_manager.h b/webrtc/modules/audio_device/android/audio_manager.h
index 6540cc5..e031591 100644
--- a/webrtc/modules/audio_device/android/audio_manager.h
+++ b/webrtc/modules/audio_device/android/audio_manager.h
@@ -18,12 +18,12 @@
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/audio_device/android/audio_common.h"
-#include "webrtc/modules/audio_device/audio_device_config.h"
-#include "webrtc/modules/audio_device/include/audio_device_defines.h"
+#include "webrtc/modules/audio_device/android/helpers_android.h"
+#include "webrtc/modules/audio_device/android/jvm_android.h"
#include "webrtc/modules/audio_device/android/opensles_common.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
-#include "webrtc/modules/utility/include/helpers_android.h"
-#include "webrtc/modules/utility/include/jvm_android.h"
+#include "webrtc/modules/audio_device/include/audio_device_defines.h"
namespace webrtc {
diff --git a/webrtc/modules/audio_device/android/audio_record_jni.h b/webrtc/modules/audio_device/android/audio_record_jni.h
index 3a1a94a..49469e6 100644
--- a/webrtc/modules/audio_device/android/audio_record_jni.h
+++ b/webrtc/modules/audio_device/android/audio_record_jni.h
@@ -17,10 +17,10 @@
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/audio_device/android/audio_manager.h"
-#include "webrtc/modules/audio_device/include/audio_device_defines.h"
+#include "webrtc/modules/audio_device/android/helpers_android.h"
+#include "webrtc/modules/audio_device/android/jvm_android.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
-#include "webrtc/modules/utility/include/helpers_android.h"
-#include "webrtc/modules/utility/include/jvm_android.h"
+#include "webrtc/modules/audio_device/include/audio_device_defines.h"
namespace webrtc {
diff --git a/webrtc/modules/audio_device/android/audio_track_jni.h b/webrtc/modules/audio_device/android/audio_track_jni.h
index 2c78a59..a80dec2 100644
--- a/webrtc/modules/audio_device/android/audio_track_jni.h
+++ b/webrtc/modules/audio_device/android/audio_track_jni.h
@@ -18,10 +18,10 @@
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/audio_device/android/audio_common.h"
#include "webrtc/modules/audio_device/android/audio_manager.h"
-#include "webrtc/modules/audio_device/include/audio_device_defines.h"
+#include "webrtc/modules/audio_device/android/helpers_android.h"
+#include "webrtc/modules/audio_device/android/jvm_android.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
-#include "webrtc/modules/utility/include/helpers_android.h"
-#include "webrtc/modules/utility/include/jvm_android.h"
+#include "webrtc/modules/audio_device/include/audio_device_defines.h"
namespace webrtc {
diff --git a/webrtc/modules/audio_device/android/build_info.cc b/webrtc/modules/audio_device/android/build_info.cc
index 3628e40..d983a58 100644
--- a/webrtc/modules/audio_device/android/build_info.cc
+++ b/webrtc/modules/audio_device/android/build_info.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/audio_device/android/build_info.h"
-#include "webrtc/modules/utility/include/helpers_android.h"
+#include "webrtc/modules/audio_device/android/helpers_android.h"
namespace webrtc {
diff --git a/webrtc/modules/audio_device/android/build_info.h b/webrtc/modules/audio_device/android/build_info.h
index d9640dd..92fb2ea 100644
--- a/webrtc/modules/audio_device/android/build_info.h
+++ b/webrtc/modules/audio_device/android/build_info.h
@@ -15,7 +15,7 @@
#include <memory>
#include <string>
-#include "webrtc/modules/utility/include/jvm_android.h"
+#include "webrtc/modules/audio_device/android/jvm_android.h"
namespace webrtc {
diff --git a/webrtc/modules/audio_device/android/ensure_initialized.cc b/webrtc/modules/audio_device/android/ensure_initialized.cc
index 9bc08ab..febfb20 100644
--- a/webrtc/modules/audio_device/android/ensure_initialized.cc
+++ b/webrtc/modules/audio_device/android/ensure_initialized.cc
@@ -23,7 +23,7 @@
#include "webrtc/base/checks.h"
#include "webrtc/modules/audio_device/android/audio_record_jni.h"
#include "webrtc/modules/audio_device/android/audio_track_jni.h"
-#include "webrtc/modules/utility/include/jvm_android.h"
+#include "webrtc/modules/audio_device/android/jvm_android.h"
namespace webrtc {
namespace audiodevicemodule {
diff --git a/webrtc/modules/utility/source/helpers_android.cc b/webrtc/modules/audio_device/android/helpers_android.cc
similarity index 96%
rename from webrtc/modules/utility/source/helpers_android.cc
rename to webrtc/modules/audio_device/android/helpers_android.cc
index aea35f8..5e5b1a9 100644
--- a/webrtc/modules/utility/source/helpers_android.cc
+++ b/webrtc/modules/audio_device/android/helpers_android.cc
@@ -8,8 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/checks.h"
-#include "webrtc/modules/utility/include/helpers_android.h"
+#include "webrtc/modules/audio_device/android/helpers_android.h"
#include <android/log.h>
#include <assert.h>
@@ -45,7 +44,7 @@
return ret;
}
-jmethodID GetMethodID (
+jmethodID GetMethodID(
JNIEnv* jni, jclass c, const char* name, const char* signature) {
jmethodID m = jni->GetMethodID(c, name, signature);
CHECK_EXCEPTION(jni) << "Error during GetMethodID: " << name << ", "
@@ -54,7 +53,7 @@
return m;
}
-jmethodID GetStaticMethodID (
+jmethodID GetStaticMethodID(
JNIEnv* jni, jclass c, const char* name, const char* signature) {
jmethodID m = jni->GetStaticMethodID(c, name, signature);
CHECK_EXCEPTION(jni) << "Error during GetStaticMethodID: " << name << ", "
diff --git a/webrtc/modules/utility/include/helpers_android.h b/webrtc/modules/audio_device/android/helpers_android.h
similarity index 91%
rename from webrtc/modules/utility/include/helpers_android.h
rename to webrtc/modules/audio_device/android/helpers_android.h
index 2840ca9..5833497 100644
--- a/webrtc/modules/utility/include/helpers_android.h
+++ b/webrtc/modules/audio_device/android/helpers_android.h
@@ -8,12 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_
-#define WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_
+#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_
+#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_
#include <jni.h>
#include <string>
+#include "webrtc/base/checks.h"
+
// Abort the process if |jni| has a Java exception pending.
// TODO(henrika): merge with CHECK_JNI_EXCEPTION() in jni_helpers.h.
#define CHECK_EXCEPTION(jni) \
@@ -84,4 +86,4 @@
} // namespace webrtc
-#endif // WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_
+#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_
diff --git a/webrtc/modules/utility/source/jvm_android.cc b/webrtc/modules/audio_device/android/jvm_android.cc
similarity index 98%
rename from webrtc/modules/utility/source/jvm_android.cc
rename to webrtc/modules/audio_device/android/jvm_android.cc
index 9d08688..832f869 100644
--- a/webrtc/modules/utility/source/jvm_android.cc
+++ b/webrtc/modules/audio_device/android/jvm_android.cc
@@ -12,7 +12,7 @@
#include <memory>
-#include "webrtc/modules/utility/include/jvm_android.h"
+#include "webrtc/modules/audio_device/android/jvm_android.h"
#include "webrtc/base/checks.h"
diff --git a/webrtc/modules/utility/include/jvm_android.h b/webrtc/modules/audio_device/android/jvm_android.h
similarity index 95%
rename from webrtc/modules/utility/include/jvm_android.h
rename to webrtc/modules/audio_device/android/jvm_android.h
index 51a0bd8..0620ad3 100644
--- a/webrtc/modules/utility/include/jvm_android.h
+++ b/webrtc/modules/audio_device/android/jvm_android.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
-#define WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
+#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_JVM_ANDROID_H_
+#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_JVM_ANDROID_H_
#include <jni.h>
@@ -17,7 +17,7 @@
#include <string>
#include "webrtc/base/thread_checker.h"
-#include "webrtc/modules/utility/include/helpers_android.h"
+#include "webrtc/modules/audio_device/android/helpers_android.h"
namespace webrtc {
@@ -184,4 +184,4 @@
} // namespace webrtc
-#endif // WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
+#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_JVM_ANDROID_H_
diff --git a/webrtc/modules/audio_device/android/opensles_player.h b/webrtc/modules/audio_device/android/opensles_player.h
index 62de50e..6fe1c11 100644
--- a/webrtc/modules/audio_device/android/opensles_player.h
+++ b/webrtc/modules/audio_device/android/opensles_player.h
@@ -18,10 +18,10 @@
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/audio_device/android/audio_common.h"
#include "webrtc/modules/audio_device/android/audio_manager.h"
+#include "webrtc/modules/audio_device/android/helpers_android.h"
#include "webrtc/modules/audio_device/android/opensles_common.h"
-#include "webrtc/modules/audio_device/include/audio_device_defines.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
-#include "webrtc/modules/utility/include/helpers_android.h"
+#include "webrtc/modules/audio_device/include/audio_device_defines.h"
namespace webrtc {
diff --git a/webrtc/modules/audio_device/android/opensles_recorder.h b/webrtc/modules/audio_device/android/opensles_recorder.h
index 952371a..158d3a8 100644
--- a/webrtc/modules/audio_device/android/opensles_recorder.h
+++ b/webrtc/modules/audio_device/android/opensles_recorder.h
@@ -20,10 +20,10 @@
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/audio_device/android/audio_common.h"
#include "webrtc/modules/audio_device/android/audio_manager.h"
+#include "webrtc/modules/audio_device/android/helpers_android.h"
#include "webrtc/modules/audio_device/android/opensles_common.h"
-#include "webrtc/modules/audio_device/include/audio_device_defines.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
-#include "webrtc/modules/utility/include/helpers_android.h"
+#include "webrtc/modules/audio_device/include/audio_device_defines.h"
namespace webrtc {
diff --git a/webrtc/modules/utility/BUILD.gn b/webrtc/modules/utility/BUILD.gn
index b8f5f2e..a648748 100644
--- a/webrtc/modules/utility/BUILD.gn
+++ b/webrtc/modules/utility/BUILD.gn
@@ -13,16 +13,12 @@
"include/audio_frame_operations.h",
"include/file_player.h",
"include/file_recorder.h",
- "include/helpers_android.h",
- "include/jvm_android.h",
"include/process_thread.h",
"source/audio_frame_operations.cc",
"source/coder.cc",
"source/coder.h",
"source/file_player.cc",
"source/file_recorder.cc",
- "source/helpers_android.cc",
- "source/jvm_android.cc",
"source/process_thread_impl.cc",
"source/process_thread_impl.h",
]
diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn
index 919708e..4fed648 100644
--- a/webrtc/voice_engine/BUILD.gn
+++ b/webrtc/voice_engine/BUILD.gn
@@ -195,7 +195,6 @@
"//webrtc/modules/audio_processing",
"//webrtc/modules/media_file",
"//webrtc/modules/rtp_rtcp",
- "//webrtc/modules/utility",
"//webrtc/system_wrappers",
"//webrtc/test:test_support_main",
]
diff --git a/webrtc/voice_engine/voice_engine_impl.cc b/webrtc/voice_engine/voice_engine_impl.cc
index 5b92d27..4dda466 100644
--- a/webrtc/voice_engine/voice_engine_impl.cc
+++ b/webrtc/voice_engine/voice_engine_impl.cc
@@ -9,10 +9,7 @@
*/
#if defined(WEBRTC_ANDROID)
-#include "webrtc/modules/audio_device/android/audio_device_template.h"
-#include "webrtc/modules/audio_device/android/audio_record_jni.h"
-#include "webrtc/modules/audio_device/android/audio_track_jni.h"
-#include "webrtc/modules/utility/include/jvm_android.h"
+#include "webrtc/modules/audio_device/android/jvm_android.h"
#endif
#include "webrtc/base/checks.h"