summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-09-17 19:04:51 -0700
committerLajos Molnar <lajos@google.com>2015-09-17 19:05:30 -0700
commitd0c26a895e9ee5e060a311974c8b9da8547271bd (patch)
tree7750190a439914ee1477491954e54a8f98ac1f73
parent2f97c3c023eb1fafccc30d8761030df5713be4be (diff)
downloadfugu-marshmallow-dr1.5-release.tar.gz
Bug: 23885483 Change-Id: I916a3156c290836478123ab7e8b86bfc8ff97e72
-rw-r--r--device.mk1
-rw-r--r--media_codecs.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/device.mk b/device.mk
index 0dc64ba..648b5d7 100644
--- a/device.mk
+++ b/device.mk
@@ -114,6 +114,7 @@ PRODUCT_COPY_FILES += \
device/asus/fugu/media_profiles.xml:system/etc/media_profiles.xml \
device/asus/fugu/wrs_omxil_components.list:system/etc/wrs_omxil_components.list \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
+ frameworks/av/media/libstagefright/data/media_codecs_google_tv.xml:system/etc/media_codecs_google_tv.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
device/asus/fugu/media_codecs.xml:system/etc/media_codecs.xml \
device/asus/fugu/media_codecs_performance.xml:system/etc/media_codecs_performance.xml \
diff --git a/media_codecs.xml b/media_codecs.xml
index a6feabd..ce829ce 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -184,5 +184,6 @@ Only the three quirks included above are recognized at this point:
</MediaCodec>
</Encoders>
+ <Include href="media_codecs_google_tv.xml" />
<Include href="media_codecs_google_video.xml" />
</MediaCodecs>