Revert "Revert "Bump PRODUCT_SHIPPING_API_LEVEL to 30""
This reverts commit 417335f7aebb3b17ee99965794b81897fc1decc6.
Reason for revert: Bug fixed by aosp/1227019.
Change-Id: Ifd2db4b0cde96843f862cb5024b22d4ad617a636
Merged-In: Ifa37ac551b9ae1d110ef4b0d68e896443cb71546
diff --git a/shared/auto/manifest.xml b/shared/auto/manifest.xml
index 7fcdd4d..60e9a85 100644
--- a/shared/auto/manifest.xml
+++ b/shared/auto/manifest.xml
@@ -9,7 +9,7 @@
*/
-->
<!-- Android Auto Embedded specific HALs-->
-<manifest version="1.0" type="device" target-level="4">
+<manifest version="1.0" type="device" target-level="5">
<hal format="hidl">
<name>android.hardware.automotive.audiocontrol</name>
<transport>hwbinder</transport>
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index 2d728e9..f6fc26d 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -16,7 +16,7 @@
** limitations under the License.
*/
-->
-<manifest version="1.0" type="device" target-level="4">
+<manifest version="1.0" type="device" target-level="5">
<kernel target-level="5" />
<hal format="hidl">
<name>android.hardware.audio</name>
diff --git a/shared/device.mk b/shared/device.mk
index 5b1065a..893b0fa 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -20,11 +20,18 @@
# Enable userspace reboot
$(call inherit-product, $(SRC_TARGET_DIR)/product/userspace_reboot.mk)
-PRODUCT_SHIPPING_API_LEVEL := 29
+PRODUCT_SHIPPING_API_LEVEL := 30
PRODUCT_BUILD_BOOT_IMAGE := true
PRODUCT_USE_DYNAMIC_PARTITIONS := true
DISABLE_RILD_OEM_HOOK := true
+# [b/148163848] Disable product enforcement only for qt-qpr1-dev-plus-aosp
+# branch. It is not merged down to master branch.
+# As qt-qpr1-dev-plus-aosp branch has qt based vendor modules that are not
+# ready for the product enforcement, we may not enable it in this branch.
+PRODUCT_USE_PRODUCT_VNDK_OVERRIDE := false
+OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := false
+
AB_OTA_UPDATER := true
AB_OTA_PARTITIONS += \
product \
diff --git a/shared/tv/manifest.xml b/shared/tv/manifest.xml
index ba78430..0dc4a45 100644
--- a/shared/tv/manifest.xml
+++ b/shared/tv/manifest.xml
@@ -16,7 +16,7 @@
** limitations under the License.
*/
-->
-<manifest version="1.0" type="device" target-level="4">
+<manifest version="1.0" type="device" target-level="5">
<!-- FIXME: Implement tv.cec HAL
<hal format="hidl">
<name>android.hardware.tv.cec</name>
