summaryrefslogtreecommitdiffstats
path: root/target/board/generic_x86
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-03-21 21:15:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-21 21:15:32 +0000
commit3d402686ca4444fea76137208af1fd71bcc8cb21 (patch)
treea843dc9134b7c84dc39851098dfac9a492271893 /target/board/generic_x86
parent9c2daa97e109b2c38789371d6eaa113277cab5ac (diff)
parentf40956fbbfc2947a8b781b88e90fe592bf073bac (diff)
downloadbuild-3d402686ca4444fea76137208af1fd71bcc8cb21.zip
build-3d402686ca4444fea76137208af1fd71bcc8cb21.tar.gz
build-3d402686ca4444fea76137208af1fd71bcc8cb21.tar.bz2
Merge "stagefright: use media_codecs_google*.xml files"
Diffstat (limited to 'target/board/generic_x86')
-rw-r--r--target/board/generic_x86/device.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk
index 089f584..b5b0faf 100644
--- a/target/board/generic_x86/device.mk
+++ b/target/board/generic_x86/device.mk
@@ -25,6 +25,9 @@ PRODUCT_PROPERTY_OVERRIDES := \
PRODUCT_COPY_FILES := \
device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \
+ 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_telephony.xml:system/etc/media_codecs_google_telephony.xml \
+ frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml
PRODUCT_PACKAGES := \