Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3ecbd52 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Inject minSdkVersion from the build system" 

am: 500fcceb

Change-Id: I5a9ab05278e8eca255f093f930b8c8913f4ddb91
parents bd3c40a0 500fcceb

core/android_manifest.mk

+22 −5
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ ifeq ($(strip $(LOCAL_MANIFEST_FILE)),) 
  LOCAL_MANIFEST_FILE := AndroidManifest.xml

endif

ifdef LOCAL_FULL_MANIFEST_FILE

  full_android_manifest := $(LOCAL_FULL_MANIFEST_FILE)

  main_android_manifest := $(LOCAL_FULL_MANIFEST_FILE)

else

  full_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE)

  main_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE)

endif



LOCAL_STATIC_JAVA_AAR_LIBRARIES := $(strip $(LOCAL_STATIC_JAVA_AAR_LIBRARIES))
@@ -32,18 +32,35 @@ ifdef LOCAL_STATIC_JAVA_AAR_LIBRARIES 
  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 $@)

	$(hide) $(ANDROID_MANIFEST_MERGER) --main $< \

	$(MANIFEST_FIXER) $< $@.tmp --minSdkVersion $(PRIVATE_MIN_SDK_VERSION)

	$(hide) $(ANDROID_MANIFEST_MERGER) --main $@.tmp \

	    --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