Merge "Bump Cuttlefish SHIPPING_API_LEVEL" into main
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index 5ac5920..3bd9768 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="202504">
+<manifest version="1.0" type="device" target-level="202604">
<!-- DO NOT ADD MORE - use vintf_fragments -->
diff --git a/shared/config/previous_manifest.xml b/shared/config/previous_manifest.xml
index 18ae50e..3d37c12 100644
--- a/shared/config/previous_manifest.xml
+++ b/shared/config/previous_manifest.xml
@@ -16,7 +16,7 @@
** limitations under the License.
*/
-->
-<manifest version="1.0" type="device" target-level="202404">
+<manifest version="1.0" type="device" target-level="202504">
<!-- DO NOT ADD MORE - use vintf_fragments -->
diff --git a/shared/device.mk b/shared/device.mk
index d1dc2b4..f3ec258 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -218,10 +218,10 @@
#
ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)
-PRODUCT_SHIPPING_API_LEVEL := 36
+PRODUCT_SHIPPING_API_LEVEL := 37
LOCAL_DEVICE_FCM_MANIFEST_FILE ?= device/google/cuttlefish/shared/config/manifest.xml
else
-PRODUCT_SHIPPING_API_LEVEL := 35
+PRODUCT_SHIPPING_API_LEVEL := 36
LOCAL_DEVICE_FCM_MANIFEST_FILE ?= device/google/cuttlefish/shared/config/previous_manifest.xml
endif
DEVICE_MANIFEST_FILE += $(LOCAL_DEVICE_FCM_MANIFEST_FILE)