From 7ce531de8e83d9d1df022718f54dbc1d0b3103a0 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Thu, 16 Jan 2020 10:04:55 -0800 Subject: [PATCH] Allow codename.fingerprint format for minSdkVersion Use codename.fingerprint format for minSdkVersion if it is unset in the manifest and UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true. BUG: 130541924 --- core/android_manifest.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/android_manifest.mk b/core/android_manifest.mk index 06bea5e955..8fab9c6aed 100644 --- a/core/android_manifest.mk +++ b/core/android_manifest.mk @@ -42,19 +42,21 @@ else endif my_target_sdk_version := $(call module-target-sdk-version) +my_min_sdk_version := $(call module-min-sdk-version) ifdef TARGET_BUILD_APPS ifndef TARGET_BUILD_APPS_USE_PREBUILT_SDK ifeq ($(my_target_sdk_version),$(PLATFORM_VERSION_CODENAME)) ifdef UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT my_target_sdk_version := $(my_target_sdk_version).$$(cat $(API_FINGERPRINT)) + my_min_sdk_version := $(my_min_sdk_version).$$(cat $(API_FINGERPRINT)) $(fixed_android_manifest): $(API_FINGERPRINT) endif endif endif endif -$(fixed_android_manifest): PRIVATE_MIN_SDK_VERSION := $(call module-min-sdk-version) +$(fixed_android_manifest): PRIVATE_MIN_SDK_VERSION := $(my_min_sdk_version) $(fixed_android_manifest): PRIVATE_TARGET_SDK_VERSION := $(my_target_sdk_version) my_exported_sdk_libs_file := $(call local-intermediates-dir,COMMON)/exported-sdk-libs