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

Merge changes from topic "manifest_fixer_target_sdk_version"

Browse Source 
* changes:
  Make manifest_fixer.py keep targetSdkVersion high with LOCAL_MIN_SDK_VERSION
  Fix setting PRIVATE_MIN_SDK_VERSION on fixed_android_manifest
This commit is contained in:
Colin Cross
2018-09-10 23:51:35 +00:00
committed by Gerrit Code Review
parent be2ae162f7 5763fd7645
commit 15f4979639
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/android_manifest.mk
View File

@@ -30,14 +30,6 @@ endif
full_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml 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))) ifneq (,$(strip $(my_full_libs_manifest_files)))
# Set up rules to merge library manifest files # Set up rules to merge library manifest files
fixed_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml.fixed fixed_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml.fixed
@@ -54,6 +46,20 @@ else
fixed_android_manifest := $(full_android_manifest) fixed_android_manifest := $(full_android_manifest)
endif 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
ifneq (,$(filter-out current system_current test_current core_current, $(LOCAL_SDK_VERSION)))
$(fixed_android_manifest): PRIVATE_TARGET_SDK_VERSION := $(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))
else
$(fixed_android_manifest): PRIVATE_TARGET_SDK_VERSION := $(DEFAULT_APP_TARGET_SDK)
endif
my_exported_sdk_libs_file := $(call local-intermediates-dir,COMMON)/exported-sdk-libs 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): PRIVATE_EXPORTED_SDK_LIBS_FILE := $(my_exported_sdk_libs_file)
$(fixed_android_manifest): $(my_exported_sdk_libs_file) $(fixed_android_manifest): $(my_exported_sdk_libs_file)
@@ -71,6 +77,8 @@ $(fixed_android_manifest): $(main_android_manifest)
@echo "Fix manifest: $@" @echo "Fix manifest: $@"
$(MANIFEST_FIXER) \ $(MANIFEST_FIXER) \
--minSdkVersion $(PRIVATE_MIN_SDK_VERSION) \ --minSdkVersion $(PRIVATE_MIN_SDK_VERSION) \
--targetSdkVersion $(PRIVATE_TARGET_SDK_VERSION) \
--raise-min-sdk-version \
$(PRIVATE_MANIFEST_FIXER_FLAGS) \ $(PRIVATE_MANIFEST_FIXER_FLAGS) \
$(if (PRIVATE_EXPORTED_SDK_LIBS_FILE),\ $(if (PRIVATE_EXPORTED_SDK_LIBS_FILE),\
$$(cat $(PRIVATE_EXPORTED_SDK_LIBS_FILE) | sort -u | sed -e 's/^/\ --uses-library\ /' | tr '\n' ' ')) \ $$(cat $(PRIVATE_EXPORTED_SDK_LIBS_FILE) | sort -u | sed -e 's/^/\ --uses-library\ /' | tr '\n' ' ')) \