Revert of Move ADM specific Android files into modules/audio_device/android/ (patchset #2 id:20001 of https://codereview.webrtc.org/2533573002/ )

Reason for revert:
Breaks downstream code

Original issue's description:
> 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
>
> Committed: https://crrev.com/e8d8a2bb9704beffed0780c7e0f3a9ef050ae97e
> Cr-Commit-Position: refs/heads/master@{#15253}

TBR=henrika@webrtc.org,perkj@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none

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

webrtc/modules/audio_device/BUILD.gn

@@ -110,10 +110,6 @@ rtc_static_library("audio_device") {
         "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",

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/audio_device/android/helpers_android.h"
+#include "webrtc/modules/utility/include/helpers_android.h"
 
 #define TAG "AudioManager"
 #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__)

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/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/audio_device/include/audio_device_defines.h"
+#include "webrtc/modules/audio_device/android/opensles_common.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"
 
 namespace webrtc {
 

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/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/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/utility/include/jvm_android.h"
 
 namespace webrtc {
 

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/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/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/utility/include/jvm_android.h"
 
 namespace webrtc {
 

webrtc/modules/audio_device/android/build_info.cc

@@ -10,7 +10,7 @@
 
 #include "webrtc/modules/audio_device/android/build_info.h"
 
-#include "webrtc/modules/audio_device/android/helpers_android.h"
+#include "webrtc/modules/utility/include/helpers_android.h"
 
 namespace webrtc {
 

webrtc/modules/audio_device/android/build_info.h

@@ -15,7 +15,7 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/modules/audio_device/android/jvm_android.h"
+#include "webrtc/modules/utility/include/jvm_android.h"
 
 namespace webrtc {
 

webrtc/modules/audio_device/android/ensure_initialized.cc

@@ -23,7 +23,7 @@ RTC_POP_IGNORING_WUNDEF()
 #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/audio_device/android/jvm_android.h"
+#include "webrtc/modules/utility/include/jvm_android.h"
 
 namespace webrtc {
 namespace audiodevicemodule {

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/audio_device_generic.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"
 
 namespace webrtc {
 

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/audio_device_generic.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"
 
 namespace webrtc {
 

webrtc/modules/utility/BUILD.gn

@@ -13,12 +13,16 @@ rtc_static_library("utility") {
     "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",
   ]

webrtc/modules/utility/include/helpers_android.h

@@ -8,14 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_
-#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_
+#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_
+#define WEBRTC_MODULES_UTILITY_INCLUDE_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)        \
@@ -86,4 +84,4 @@ class ScopedGlobalRef {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_
+#endif  // WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_

webrtc/modules/utility/include/jvm_android.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_JVM_ANDROID_H_
-#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_JVM_ANDROID_H_
+#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
+#define WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
 
 #include <jni.h>
 
@@ -17,7 +17,7 @@
 #include <string>
 
 #include "webrtc/base/thread_checker.h"
-#include "webrtc/modules/audio_device/android/helpers_android.h"
+#include "webrtc/modules/utility/include/helpers_android.h"
 
 namespace webrtc {
 
@@ -184,4 +184,4 @@ class JVM {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_JVM_ANDROID_H_
+#endif  // WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_

webrtc/modules/utility/source/helpers_android.cc

@@ -8,7 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_device/android/helpers_android.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/modules/utility/include/helpers_android.h"
 
 #include <android/log.h>
 #include <assert.h>
@@ -44,7 +45,7 @@ jlong PointerTojlong(void* ptr) {
   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 << ", "
@@ -53,7 +54,7 @@ jmethodID GetMethodID(
   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 << ", "

webrtc/modules/utility/source/jvm_android.cc

@@ -12,7 +12,7 @@
 
 #include <memory>
 
-#include "webrtc/modules/audio_device/android/jvm_android.h"
+#include "webrtc/modules/utility/include/jvm_android.h"
 
 #include "webrtc/base/checks.h"
 

webrtc/voice_engine/BUILD.gn

@@ -195,6 +195,7 @@ if (rtc_include_tests) {
       "//webrtc/modules/audio_processing",
       "//webrtc/modules/media_file",
       "//webrtc/modules/rtp_rtcp",
+      "//webrtc/modules/utility",
       "//webrtc/system_wrappers",
       "//webrtc/test:test_support_main",
     ]

webrtc/voice_engine/voice_engine_impl.cc

@@ -9,7 +9,10 @@
  */
 
 #if defined(WEBRTC_ANDROID)
-#include "webrtc/modules/audio_device/android/jvm_android.h"
+#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"
 #endif
 
 #include "webrtc/base/checks.h"