From 1b8b0de9c8174636b327643fc1b3ac53c4d7d5eb Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Tue, 19 Jul 2022 18:24:17 +0000 Subject: [PATCH 1/3] Update raven SVN to 36 Bug: 232157623 Change-Id: If1887154a1928961a07d4d892f9bb12e76db5b36 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 4599c00..09900d8 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -178,7 +178,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 9897aff89b8fca80323c7bfa7798059fd9eb6fd6 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Tue, 19 Jul 2022 18:25:42 +0000 Subject: [PATCH 2/3] Update oriole SVN to 36 Bug: 232157623 Change-Id: Id6d742e62ffceb1db753a60a3ae0c376036e2afd --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 4c62246..b652ae5 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -168,7 +168,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 287239d28aafec502ad27e23911e4deabebe2241 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 20 Jul 2022 11:59:10 +0200 Subject: [PATCH 3/3] Revert "Oriole/Raven: enable Dolby DD+ decoder" This reverts commit 8074cbccb4dd0c0ffe4a6424f65b362014c80ed6. Reason for revet: This should be in vendor make files. Bug: 238831180 Test: make Change-Id: Ib739344838f98bf0d29e7693df57ae5950826703 --- device-oriole.mk | 10 ------ device-raven.mk | 12 ------- media_codecs_dolby_c2.xml | 66 --------------------------------------- 3 files changed, 88 deletions(-) delete mode 100644 media_codecs_dolby_c2.xml diff --git a/device-oriole.mk b/device-oriole.mk index 047bade..ceb5eba 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -248,13 +248,3 @@ PRODUCT_PACKAGES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml - -# Dolby integration --include vendor/dolby/ds/dolby-buildspec.mk -$(call inherit-product-if-exists, vendor/dolby/ds/dolby-product.mk) -# overwrite file coming from device/google/gs101/media_codecs_bo_c2.xml -PRODUCT_COPY_FILES := \ - device/google/raviole/media_codecs_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(PRODUCT_COPY_FILES) - -PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/device-raven.mk b/device-raven.mk index 932db3c..d51b7a0 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -262,15 +262,3 @@ PRODUCT_PACKAGES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml - -# Dolby integration --include vendor/dolby/ds/dolby-buildspec.mk -$(call inherit-product-if-exists, vendor/dolby/ds/dolby-product.mk) -# overwrite file coming from device/google/gs101/media_codecs_bo_c2.xml -PRODUCT_COPY_FILES := \ - device/google/raviole/media_codecs_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(PRODUCT_COPY_FILES) - -PRODUCT_RESTRICT_VENDOR_FILES := false - -PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example diff --git a/media_codecs_dolby_c2.xml b/media_codecs_dolby_c2.xml deleted file mode 100644 index e7ecfd9..0000000 --- a/media_codecs_dolby_c2.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -