Allow codename.fingerprint format for targetSdkVersion
Use codename.fingerprint format for targetSdkVersion if it is unset
in the manifest and UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true.
Test: manual
Bug: 130541924
Change-Id: Ie748d1963ff6f525f8d9e551b73846c3e1c7f9a2
diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index 931b1b1..1f7acf1 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -47,8 +47,21 @@
fixed_android_manifest := $(full_android_manifest)
endif
+my_target_sdk_version := $(call module-target-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))
+ $(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_TARGET_SDK_VERSION := $(call module-target-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
$(fixed_android_manifest): PRIVATE_EXPORTED_SDK_LIBS_FILE := $(my_exported_sdk_libs_file)