diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2015-07-01 17:46:34 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2015-07-01 17:53:02 +0800 |
| commit | 9faaf154773ae5c13cea2d51f773a1e1e9b4941f (patch) | |
| tree | ef283dfc80e22af4fd5f2d187080e92fdeed081c | |
| parent | 4e07303ebcd4c0a21035d9f3db201df3f02eb949 (diff) | |
| download | common-9faaf154773ae5c13cea2d51f773a1e1e9b4941f.tar.gz | |
common-device.mk: enabled mediacodec by default
move the copy of media_codecs.xml file from extra-and-tests.mk to
common-device.mk, so that mediaplayback will be enabled without
any condition
Change-Id: I3fc15a9eddef643baf7e22f7ab5428d1bda8860d
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | common-device.mk | 4 | ||||
| -rw-r--r-- | extra-and-tests.mk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/common-device.mk b/common-device.mk index e436ef5..a0b3c93 100644 --- a/common-device.mk +++ b/common-device.mk @@ -16,6 +16,10 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ device/linaro/build/android_dhcpcd.conf:system/etc/dhcpcd/dhcpcd.conf) +# Copy media codecs config file +# so that to enable mediaplayback +PRODUCT_COPY_FILES += device/linaro/build/media_codecs.xml:system/etc/media_codecs.xml + ifeq ($(INCLUDE_TESTS), 1) # integrate tests that will not be integrated by default $(call inherit-product-if-exists, device/linaro/build/extra-and-tests.mk) diff --git a/extra-and-tests.mk b/extra-and-tests.mk index b5e87d0..1bdc9c1 100644 --- a/extra-and-tests.mk +++ b/extra-and-tests.mk @@ -16,8 +16,6 @@ COMMON_EXTRA_TESTS_DIR := device/linaro/build/extra-and-tests/ # repository: https://android.git.linaro.org/gitweb/platform/external/linaro-android-kernel-test.git -include external/linaro-android-kernel-test/product.mk -# Copy media codecs config file -PRODUCT_COPY_FILES += device/linaro/build/media_codecs.xml:system/etc/media_codecs.xml # integrate the tests of linaro-android-userspace # repository: https://android.git.linaro.org/gitweb/platform/external/linaro-android-userspace-test.git -include external/linaro-android-userspace-test/product.mk |