commit fedcf86936382fdb3b8aa521258f9e68f56801ee
author Colin Cross <ccross@android.com> Mon Sep 10 13:47:48 2018 -0700
committer Colin Cross <ccross@android.com> Mon Sep 10 14:41:37 2018 -0700
tree a44293ee712bd29980ea0235639ca01cbc22ec93
parent be2ae162f7c16bd44d9eaba68f416375463bf624

Fix setting PRIVATE_MIN_SDK_VERSION on fixed_android_manifest

full_android_manifest may or may not be equal to
fixed_android_manifest, set PRIVATE_MIN_SDK_VERSION on
fixed_android_manifest instead.

Test: m checkbuild
Change-Id: I21795317a1334ebed772e781aeefba87392a8478

core/android_manifest.mk

diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index d1cfe15..4152ff1 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -30,14 +30,6 @@
 
 full_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml
 
-ifdef LOCAL_MIN_SDK_VERSION
-  $(full_android_manifest): PRIVATE_MIN_SDK_VERSION := $(LOCAL_MIN_SDK_VERSION)
-else ifneq (,$(filter-out current system_current test_current core_current, $(LOCAL_SDK_VERSION)))
-  $(full_android_manifest): PRIVATE_MIN_SDK_VERSION := $(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))
-else
-  $(full_android_manifest): PRIVATE_MIN_SDK_VERSION := $(DEFAULT_APP_TARGET_SDK)
-endif
-
 ifneq (,$(strip $(my_full_libs_manifest_files)))
   # Set up rules to merge library manifest files
   fixed_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml.fixed
@@ -54,6 +46,14 @@
   fixed_android_manifest := $(full_android_manifest)
 endif
 
+ifdef LOCAL_MIN_SDK_VERSION
+  $(fixed_android_manifest): PRIVATE_MIN_SDK_VERSION := $(LOCAL_MIN_SDK_VERSION)
+else ifneq (,$(filter-out current system_current test_current core_current, $(LOCAL_SDK_VERSION)))
+  $(fixed_android_manifest): PRIVATE_MIN_SDK_VERSION := $(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))
+else
+  $(fixed_android_manifest): PRIVATE_MIN_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)