use default google audio codecs list
include media_codecs_google_audio.xml in media_codecs.xml
instead of listing audio codecs.
Bug: 29025520
Change-Id: Ie699a25692154dce5f2046b7394d26faf13e4d52
diff --git a/device.mk b/device.mk
index 5953761..3e4c615 100644
--- a/device.mk
+++ b/device.mk
@@ -99,4 +99,7 @@
device/linaro/hikey/audio/audio_policy.conf:system/etc/audio_policy.conf
# Copy media codecs config file
-PRODUCT_COPY_FILES += device/linaro/hikey/etc/media_codecs.xml:system/etc/media_codecs.xml
+PRODUCT_COPY_FILES += \
+ device/linaro/hikey/etc/media_codecs.xml:system/etc/media_codecs.xml \
+ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml
+
diff --git a/etc/media_codecs.xml b/etc/media_codecs.xml
index 8d46b98..424914d 100644
--- a/etc/media_codecs.xml
+++ b/etc/media_codecs.xml
@@ -76,16 +76,8 @@
-->
<MediaCodecs>
+ <Include href="media_codecs_google_audio.xml" />
<Decoders>
- <MediaCodec name="OMX.google.mp3.decoder" type="audio/mpeg" />
- <MediaCodec name="OMX.google.amrnb.decoder" type="audio/3gpp" />
- <MediaCodec name="OMX.google.amrwb.decoder" type="audio/amr-wb" />
- <MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm" />
- <MediaCodec name="OMX.google.g711.alaw.decoder" type="audio/g711-alaw" />
- <MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw" />
- <MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" />
- <MediaCodec name="OMX.google.gsm.decoder" type="audio/gsm" />
-
<MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
<MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />
<MediaCodec name="OMX.google.h264.decoder" type="video/avc" />
@@ -94,13 +86,9 @@
</Decoders>
<Encoders>
- <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
- <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" />
- <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
<MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" />
<MediaCodec name="OMX.google.h264.encoder" type="video/avc" />
<MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" />
- <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" />
<MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" />
</Encoders>
</MediaCodecs>
