Index: webrtc/modules/audio_coding/BUILD.gn |
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn |
index b1d8cebdec84fda9bac57d72d9e73a0829d15f97..5725ec03df4d5be9cbb5c8087793f29ad0de436a 100644 |
--- a/webrtc/modules/audio_coding/BUILD.gn |
+++ b/webrtc/modules/audio_coding/BUILD.gn |
@@ -67,8 +67,13 @@ |
deps = [ |
":cng", |
":g711", |
+ ":g722", |
+ ":ilbc", |
+ ":isac", |
+ ":isac_fix", |
":neteq", |
":pcm16b", |
+ ":red", |
"../..:rtc_event_log", |
"../..:webrtc_common", |
"../../common_audio", |
@@ -78,27 +83,6 @@ |
if (rtc_include_opus) { |
defines += [ "WEBRTC_CODEC_OPUS" ] |
deps += [ ":webrtc_opus" ] |
- } |
- if (!build_with_mozilla) { |
- if (current_cpu == "arm") { |
- defines += [ "WEBRTC_CODEC_ISACFX" ] |
- deps += [ ":isac_fix" ] |
- } else { |
- defines += [ "WEBRTC_CODEC_ISAC" ] |
- deps += [ ":isac" ] |
- } |
- defines += [ "WEBRTC_CODEC_G722" ] |
- deps += [ ":g722" ] |
- } |
- if (!build_with_mozilla && !build_with_chromium) { |
- defines += [ |
- "WEBRTC_CODEC_ILBC", |
- "WEBRTC_CODEC_RED", |
- ] |
- deps += [ |
- ":ilbc", |
- ":red", |
- ] |
} |
} |
@@ -804,6 +788,10 @@ |
":audio_decoder_interface", |
":cng", |
":g711", |
+ ":g722", |
+ ":ilbc", |
+ ":isac", |
+ ":isac_fix", |
":pcm16b", |
"../..:webrtc_common", |
"../../common_audio", |
@@ -816,19 +804,4 @@ |
defines += [ "WEBRTC_CODEC_OPUS" ] |
deps += [ ":webrtc_opus" ] |
} |
- if (!build_with_mozilla) { |
- if (current_cpu == "arm") { |
- defines += [ "WEBRTC_CODEC_ISACFX" ] |
- deps += [ ":isac_fix" ] |
- } else { |
- defines += [ "WEBRTC_CODEC_ISAC" ] |
- deps += [ ":isac" ] |
- } |
- defines += [ "WEBRTC_CODEC_G722" ] |
- deps += [ ":g722" ] |
- } |
- if (!build_with_mozilla && !build_with_chromium) { |
- defines += [ "WEBRTC_CODEC_ILBC" ] |
- deps += [ ":ilbc" ] |
- } |
-} |
+} |