Revert "Limit System SDK to 34 for Java modules in the vendor pa..."
Revert submission 2894701-limit_systemsdk
Reason for revert: might be breaking builds at 318695834
Bug: 318695834
Reverted changes: /q/submissionid:2894701-limit_systemsdk
Change-Id: Idfaec65ddfbb0091672993d6c857a06e9cfdfb13
diff --git a/core/local_current_sdk.mk b/core/local_current_sdk.mk
index ccdbf77..ea7da8a 100644
--- a/core/local_current_sdk.mk
+++ b/core/local_current_sdk.mk
@@ -14,24 +14,13 @@
# limitations under the License.
#
ifdef BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES
- _override_to := $(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES)
-
- # b/314011075: apks and jars in the vendor or odm partitions cannot use
- # system SDK 35 and beyond. In order not to suddenly break those vendor
- # modules using current or system_current as their LOCAL_SDK_VERSION,
- # override it to 34, which is the maximum API level allowed for them.
- ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS)))
- _override_to := 34
- endif
-
- ifneq (current,$(_override_to))
+ ifneq (current,$(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES))
ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))
ifeq (current,$(LOCAL_SDK_VERSION))
- LOCAL_SDK_VERSION := $(_override_to)
+ LOCAL_SDK_VERSION := $(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES)
else ifeq (system_current,$(LOCAL_SDK_VERSION))
- LOCAL_SDK_VERSION := system_$(_override_to)
+ LOCAL_SDK_VERSION := system_$(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES)
endif
endif
endif
- _override_to :=
endif