commit b2b6cd3af9449cfb647d52d85faec193c2436485
author Sami Kalliomäki <sakal@webrtc.org> Mon Jul 27 13:50:07 2020
committer Commit Bot <commit-bot@chromium.org> Tue Jul 28 09:50:07 2020
tree 8610fbc232b35febf65f1cd1edb25142e31b6be5
parent 0bb26390604ec8589a1986f0fbc52749523b38bd

Delete dead code from JNI audio header.

Bug: webrtc:9048
Change-Id: I912a50f84a3afbb7cd13357ba8b134323fd53ed9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180343
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31797}

sdk/android/BUILD.gn

diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 4506cbd..de91306 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -570,8 +570,6 @@
     deps = [
       ":base_jni",
       ":builtin_audio_codecs_jni",
-      "../../api/audio_codecs:builtin_audio_decoder_factory",
-      "../../api/audio_codecs:builtin_audio_encoder_factory",
       "../../modules/audio_processing",
       "../../modules/audio_processing:api",
       "../../rtc_base:rtc_base_approved",

sdk/android/src/jni/pc/audio.cc

diff --git a/sdk/android/src/jni/pc/audio.cc b/sdk/android/src/jni/pc/audio.cc
index 376c421..74c8b55 100644
--- a/sdk/android/src/jni/pc/audio.cc
+++ b/sdk/android/src/jni/pc/audio.cc
@@ -10,21 +10,11 @@
 
 #include "sdk/android/src/jni/pc/audio.h"
 
-#include "api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "modules/audio_processing/include/audio_processing.h"
 
 namespace webrtc {
 namespace jni {
 
-rtc::scoped_refptr<AudioDecoderFactory> CreateAudioDecoderFactory() {
-  return CreateBuiltinAudioDecoderFactory();
-}
-
-rtc::scoped_refptr<AudioEncoderFactory> CreateAudioEncoderFactory() {
-  return CreateBuiltinAudioEncoderFactory();
-}
-
 rtc::scoped_refptr<AudioProcessing> CreateAudioProcessing() {
   return AudioProcessingBuilder().Create();
 }

sdk/android/src/jni/pc/audio.h

diff --git a/sdk/android/src/jni/pc/audio.h b/sdk/android/src/jni/pc/audio.h
index 1e8b3ac..7a79bed 100644
--- a/sdk/android/src/jni/pc/audio.h
+++ b/sdk/android/src/jni/pc/audio.h
@@ -11,20 +11,14 @@
 #ifndef SDK_ANDROID_SRC_JNI_PC_AUDIO_H_
 #define SDK_ANDROID_SRC_JNI_PC_AUDIO_H_
 
+#include "api/scoped_refptr.h"
 // Adding 'nogncheck' to disable the gn include headers check.
 // We don't want this target depend on audio related targets
-#include "api/audio_codecs/audio_decoder_factory.h"  // nogncheck
-#include "api/audio_codecs/audio_encoder_factory.h"  // nogncheck
-#include "api/scoped_refptr.h"
 #include "modules/audio_processing/include/audio_processing.h"  // nogncheck
 
 namespace webrtc {
 namespace jni {
 
-rtc::scoped_refptr<AudioDecoderFactory> CreateAudioDecoderFactory();
-
-rtc::scoped_refptr<AudioEncoderFactory> CreateAudioEncoderFactory();
-
 rtc::scoped_refptr<AudioProcessing> CreateAudioProcessing();
 
 }  // namespace jni