From ec718bda1416fec4891925afdda894d7454f1bc7 Mon Sep 17 00:00:00 2001 From: Liana Kazanova Date: Mon, 24 Jun 2024 16:31:25 +0000 Subject: [PATCH] Revert "Move PRODUCT_SHIPPING_API_LEVEL to define 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: I832aa38d9fb3a2d0d182c3c7ff06bfe67352871f --- device-caiman.mk | 2 -- device-komodo.mk | 2 -- device-ripcurrent24.mk | 2 -- device-ripcurrentpro.mk | 2 -- device-tokay.mk | 2 -- 5 files changed, 10 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 4ed5a9ce..9787966d 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -14,8 +14,6 @@ # limitations under the License. # -SHIPPING_API_LEVEL := 34 - ifdef RELEASE_GOOGLE_CAIMAN_RADIO_DIR RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIO_DIR) endif diff --git a/device-komodo.mk b/device-komodo.mk index e36be0b1..a9729448 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -14,8 +14,6 @@ # limitations under the License. # -SHIPPING_API_LEVEL := 34 - ifdef RELEASE_GOOGLE_KOMODO_RADIO_DIR RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_KOMODO_RADIO_DIR) endif diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk index ffacfa1a..e5cd9146 100644 --- a/device-ripcurrent24.mk +++ b/device-ripcurrent24.mk @@ -14,8 +14,6 @@ # limitations under the License. # -SHIPPING_API_LEVEL := 34 - ifdef RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR) endif diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index 4b6bbf43..5113cad0 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -14,8 +14,6 @@ # limitations under the License. # -SHIPPING_API_LEVEL := 34 - ifdef RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR) endif diff --git a/device-tokay.mk b/device-tokay.mk index 150b6e69..48dd18a8 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -14,8 +14,6 @@ # limitations under the License. # -SHIPPING_API_LEVEL := 34 - ifdef RELEASE_GOOGLE_TOKAY_RADIO_DIR RELEASE_GOOGLE_PRODUCT_RADIO_DIR ?= $(RELEASE_GOOGLE_TOKAY_RADIO_DIR) endif