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/base_rules.mk b/core/base_rules.mk
index 254bfeb..a446483 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -121,16 +121,8 @@
$(LOCAL_PROPRIETARY_MODULE))
include $(BUILD_SYSTEM)/local_vndk.mk
-
-# local_current_sdk needs to run before local_systemsdk because the former may override
-# LOCAL_SDK_VERSION which is used by the latter.
-include $(BUILD_SYSTEM)/local_current_sdk.mk
-
-# Check if the use of System SDK is correct. Note that, for Soong modules, the system sdk version
-# check is done in Soong. No need to do it twice.
-ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
include $(BUILD_SYSTEM)/local_systemsdk.mk
-endif
+include $(BUILD_SYSTEM)/local_current_sdk.mk
# Ninja has an implicit dependency on the command being run, and kati will
# regenerate the ninja manifest if any read makefile changes, so there is no