Revert "Inject minSdkVersion from the build system"
This reverts commit fae93680fa1bc340c830b0f4d62c707996fefd38.
Bug: 110167203
Bug: 110353795
Change-Id: I14c71aec5a54ef055fc8d2b3560754c81f3d68ba
diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index e52bb2c..08f3f38 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -6,9 +6,9 @@
LOCAL_MANIFEST_FILE := AndroidManifest.xml
endif
ifdef LOCAL_FULL_MANIFEST_FILE
- main_android_manifest := $(LOCAL_FULL_MANIFEST_FILE)
+ full_android_manifest := $(LOCAL_FULL_MANIFEST_FILE)
else
- main_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE)
+ full_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE)
endif
LOCAL_STATIC_JAVA_AAR_LIBRARIES := $(strip $(LOCAL_STATIC_JAVA_AAR_LIBRARIES))
@@ -32,35 +32,18 @@
endif
endif
-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
-
# Set up rules to merge library manifest files
ifneq (,$(strip $(my_full_libs_manifest_files)))
+main_android_manifest := $(full_android_manifest)
+full_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml
$(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files)
$(full_android_manifest): $(ANDROID_MANIFEST_MERGER_CLASSPATH)
-$(full_android_manifest): $(MANIFEST_FIXER)
$(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_files)
@echo "Merge android manifest files: $@ <-- $< $(PRIVATE_LIBS_MANIFESTS)"
@mkdir -p $(dir $@)
- $(MANIFEST_FIXER) $< $@.tmp --minSdkVersion $(PRIVATE_MIN_SDK_VERSION)
- $(hide) $(ANDROID_MANIFEST_MERGER) --main $@.tmp \
+ $(hide) $(ANDROID_MANIFEST_MERGER) --main $< \
--libs $(call normalize-path-list,$(PRIVATE_LIBS_MANIFESTS)) \
--out $@
- rm $@.tmp
-
-else
-$(full_android_manifest): $(MANIFEST_FIXER)
-$(full_android_manifest): $(main_android_manifest)
- @echo "Fix manifest: $@"
- $(MANIFEST_FIXER) $< $@ --minSdkVersion $(PRIVATE_MIN_SDK_VERSION)
endif