StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add minSdkVersion to default manifests"

Browse Source
This commit is contained in:
Treehugger Robot
2018-05-24 01:18:10 +00:00
committed by Gerrit Code Review
parent 7f706cabac d45079a9ff
commit bd842d0b64
2 changed files with 13 additions and 3 deletions
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 define _create-default-manifest-file
$(1): $(1):
rm -f $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 endef
define create-default-manifest-file define create-default-manifest-file
$(eval $(call _create-default-manifest-file,$(1))) $(eval $(call _create-default-manifest-file,$(1),$(2)))
endef 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 # work around missing manifests by creating a default one
$(call pretty-warning, Missing manifest file) $(call pretty-warning, Missing manifest file)
LOCAL_FULL_MANIFEST_FILE := $(call local-intermediates-dir,COMMON)/DefaultManifest.xml 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 endif
endif endif