diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-09-11 18:31:53 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-09-11 18:31:53 +0000 |
| commit | 343283c75809b5b1ae4fb3ea5b93800c6082347e (patch) | |
| tree | e5649270578aa0226cd5c1e697c00b8ad679e4c6 | |
| parent | c13ca78c06404f78329715afc09a0028a83e9849 (diff) | |
| parent | 89ba87960154cf4d8a4680eefc6b0de531173652 (diff) | |
| download | crosshatch-pie-qpr1-s1-release.tar.gz | |
Merge cherrypicks of [4994098, 4995471, 4995472, 4995491, 4995492, 4995511, 4995512, 4995513] into pi-qpr1-releaseandroid-9.0.0_r16pie-qpr1-s1-release
Change-Id: Iad5b9bfd20ed24a937e08092803cf5b6c0c1817c
| -rw-r--r-- | device.mk | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -559,22 +559,17 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ $(LOCAL_PATH)/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \ $(LOCAL_PATH)/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ $(LOCAL_PATH)/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ $(LOCAL_PATH)/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \ - $(LOCAL_PATH)/media_codecs_google_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_audio.xml \ $(LOCAL_PATH)/media_codecs_google_c2_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_telephony.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_video.xml \ -# configures both aac and xaac decoders -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ - -# and ensure that the xaac decoder is built -PRODUCT_PACKAGES += \ - libstagefright_soft_xaacdec.vendor +# no xaac codecs for now, so don't copy the media_codecs_google*audio.xml files at this time. PRODUCT_PROPERTY_OVERRIDES += \ audio.snd_card.open.retries=50 @@ -795,4 +790,4 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 |