From d52c3bc6b2efd53627ab2c1585ab25722a5f97b2 Mon Sep 17 00:00:00 2001
From: Cyan Hsieh <cyanhsieh@google.com>
Date: Tue, 25 Jun 2024 07:59:24 +0000
Subject: [PATCH] Revert "Revert "Move PRODUCT_SHIPPING_API_LEVEL to defined by
 de..."

7efa373263a34047b58202cdd90c4bd673936ea7

Bug: 312876454
Change-Id: Ifedf3d3a98845830ff4d2b42e333a384926bc266
---
 device.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/device.mk b/device.mk
index 3389983..f9a01c8 100644
--- a/device.mk
+++ b/device.mk
@@ -395,6 +395,8 @@ PRODUCT_VENDOR_PROPERTIES += \
 # GRAPHICS - GPU (end)
 # ####################
 
+PRODUCT_SHIPPING_API_LEVEL := $(SHIPPING_API_LEVEL)
+
 # Device Manifest, Device Compatibility Matrix for Treble
 DEVICE_MANIFEST_FILE := \
 	device/google/zumapro/manifest.xml
@@ -419,8 +421,6 @@ DEVICE_MATRIX_FILE := \
 
 DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay
 
-PRODUCT_SHIPPING_API_LEVEL := 34
-
 # RKP VINTF
 -include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk