Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9419d0b authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Automerger Merge Worker
Browse files

Merge "Use flag for min supported target sdk" into main am: 8fbc0cfa 

Original change: https://android-review.googlesource.com/c/platform/build/+/3037729



Change-Id: Ide48d45bc903f444c9b3d179625ea29f59c8ac65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e715d159 8fbc0cfa

core/soong_config.mk

+0 −2
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ $(call add_json_str, Platform_version_known_codenames, $(PLATFORM_VERSION_KNOW 


$(call add_json_bool, Release_aidl_use_unfrozen,         $(RELEASE_AIDL_USE_UNFROZEN))



$(call add_json_str,  Platform_min_supported_target_sdk_version, $(PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION))



$(call add_json_bool, Allow_missing_dependencies,        $(filter true,$(ALLOW_MISSING_DEPENDENCIES)))

$(call add_json_bool, Unbundled_build,                   $(TARGET_BUILD_UNBUNDLED))

$(call add_json_list, Unbundled_build_apps,              $(TARGET_BUILD_APPS))

core/version_util.mk

+3 −5
Original line number Diff line number Diff line
@@ -221,10 +221,8 @@ ifndef HAS_BUILD_NUMBER 
endif

.KATI_READONLY := HAS_BUILD_NUMBER



ifndef PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION

  # Used to set minimum supported target sdk version. Apps targeting sdk

  # version lower than the set value will result in a warning being shown

  # when any activity from the app is started.

  PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28

ifdef PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION

  $(error Do not set PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION directly. Use RELEASE_PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION. value: $(PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION))

endif

PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := $(RELEASE_PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION)

.KATI_READONLY := PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION