tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add minSdkVersion to default manifests"

Browse source 
am: bd842d0b64

Change-Id: I42a79f0a41fa8a3822cc1b0ab7cc4037a68e09ba
This commit is contained in:
Colin Cross 2018-05-24 07:32:59 -07:00 committed by android-build-merger
commit f3aa016621
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/definitions.mk
View file

@ -2150,11 +2150,13 @@ endef
define _create-default-manifest-file
$(1):
rm -f $1
echo '<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="missing.manifest"></manifest>' > $1
(echo '<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="missing.manifest">' && \
echo ' <uses-sdk android:minSdkVersion="$(2)" />' && \
echo '</manifest>' ) > $1
endef
define create-default-manifest-file
$(eval $(call _create-default-manifest-file,$(1)))
$(eval $(call _create-default-manifest-file,$(1),$(2)))
endef

10
core/force_aapt2.mk
View file

@ -49,7 +49,15 @@ ifeq ($(FORCE_AAPT2),true)
# work around missing manifests by creating a default one
$(call pretty-warning, Missing manifest file)
LOCAL_FULL_MANIFEST_FILE := $(call local-intermediates-dir,COMMON)/DefaultManifest.xml
$(call create-default-manifest-file,$(LOCAL_FULL_MANIFEST_FILE))
ifdef LOCAL_MIN_SDK_VERSION
my_manifest_min_sdk_version := $(LOCAL_MIN_SDK_VERSION)
else ifneq (,$(filter-out current system_current test_current core_current, $(LOCAL_SDK_VERSION)))
my_manifest_min_sdk_version := $(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))
else
my_manifest_min_sdk_version := $(DEFAULT_APP_TARGET_SDK)
endif
$(call create-default-manifest-file,$(LOCAL_FULL_MANIFEST_FILE),$(my_manifest_min_sdk_version))
my_manifest_min_sdk_version :=
endif
endif
endif