From 5edb0b9446f2778ddee77933e88ed5c4a8eec1bc Mon Sep 17 00:00:00 2001
From: Liana Kazanova <lkazanova@google.com>
Date: Mon, 24 Jun 2024 16:31:25 +0000
Subject: [PATCH] Revert "Move PRODUCT_SHIPPING_API_LEVEL to defined by device"

Revert submission 27975044-ship_api_35

Reason for revert: DroidMonitor: Potential culprit for b/349087711 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:27975044-ship_api_35

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

diff --git a/device.mk b/device.mk
index f9a01c8..3389983 100644
--- a/device.mk
+++ b/device.mk
@@ -395,8 +395,6 @@ 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
@@ -421,6 +419,8 @@ 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