From 5763fd7645102fbb1bbdb7b386e16c58664a781e Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 10 Sep 2018 13:37:10 -0700 Subject: [PATCH] Make manifest_fixer.py keep targetSdkVersion high with LOCAL_MIN_SDK_VERSION targetSdkVersion should stay as "current" when LOCAL_MIN_SDK_VERSION is set but LOCAL_SDK_VERSION is not. Bug: 112438448 Test: atest CtsTelecomTestCases Change-Id: I72a2dc1073013863f5f8c44f271eace2a4e37a23 --- core/android_manifest.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/android_manifest.mk b/core/android_manifest.mk index 4152ff120f..8e8bfecef1 100644 --- a/core/android_manifest.mk +++ b/core/android_manifest.mk @@ -54,6 +54,12 @@ else $(fixed_android_manifest): PRIVATE_MIN_SDK_VERSION := $(DEFAULT_APP_TARGET_SDK) endif +ifneq (,$(filter-out current system_current test_current core_current, $(LOCAL_SDK_VERSION))) + $(fixed_android_manifest): PRIVATE_TARGET_SDK_VERSION := $(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)) +else + $(fixed_android_manifest): PRIVATE_TARGET_SDK_VERSION := $(DEFAULT_APP_TARGET_SDK) +endif + 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) $(fixed_android_manifest): $(my_exported_sdk_libs_file) @@ -71,6 +77,8 @@ $(fixed_android_manifest): $(main_android_manifest) @echo "Fix manifest: $@" $(MANIFEST_FIXER) \ --minSdkVersion $(PRIVATE_MIN_SDK_VERSION) \ + --targetSdkVersion $(PRIVATE_TARGET_SDK_VERSION) \ + --raise-min-sdk-version \ $(PRIVATE_MANIFEST_FIXER_FLAGS) \ $(if (PRIVATE_EXPORTED_SDK_LIBS_FILE),\ $$(cat $(PRIVATE_EXPORTED_SDK_LIBS_FILE) | sort -u | sed -e 's/^/\ --uses-library\ /' | tr '\n' ' ')) \