e6210f6eb2
AAPT2 is used everywhere now, remove support for AAPT1. Also removes dpi_specific_apk.mk, it was never updated to use AAPT2 and has been generating bad APKs (resource ID mismatch between the dex files and the resources) since AAPT2 was made the default in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863). Bug: 80450981 Test: m checkbuild Change-Id: I2ff768897360ff866dbae5562455bab22be270f7 Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
97 lines
4.2 KiB
Makefile
97 lines
4.2 KiB
Makefile
# Handle AndroidManifest.xmls
|
|
# Input: LOCAL_MANIFEST_FILE, LOCAL_FULL_MANIFEST_FILE, LOCAL_FULL_LIBS_MANIFEST_FILES,
|
|
# LOCAL_USE_EMBEDDED_NATIVE_LIBS
|
|
# Output: full_android_manifest
|
|
|
|
ifeq ($(strip $(LOCAL_MANIFEST_FILE)),)
|
|
LOCAL_MANIFEST_FILE := AndroidManifest.xml
|
|
endif
|
|
ifdef LOCAL_FULL_MANIFEST_FILE
|
|
main_android_manifest := $(LOCAL_FULL_MANIFEST_FILE)
|
|
else
|
|
main_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE)
|
|
endif
|
|
|
|
LOCAL_STATIC_JAVA_AAR_LIBRARIES := $(strip $(LOCAL_STATIC_JAVA_AAR_LIBRARIES))
|
|
|
|
my_full_libs_manifest_files :=
|
|
|
|
ifndef LOCAL_DONT_MERGE_MANIFESTS
|
|
my_full_libs_manifest_files += $(LOCAL_FULL_LIBS_MANIFEST_FILES)
|
|
|
|
my_full_libs_manifest_files += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES) $(LOCAL_STATIC_ANDROID_LIBRARIES),\
|
|
$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/manifest/AndroidManifest.xml)
|
|
endif
|
|
|
|
full_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml
|
|
|
|
ifneq (,$(strip $(my_full_libs_manifest_files)))
|
|
# Set up rules to merge library manifest files
|
|
fixed_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml.fixed
|
|
|
|
$(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files)
|
|
$(full_android_manifest): $(ANDROID_MANIFEST_MERGER)
|
|
$(full_android_manifest) : $(fixed_android_manifest) $(my_full_libs_manifest_files)
|
|
@echo "Merge android manifest files: $@ <-- $< $(PRIVATE_LIBS_MANIFESTS)"
|
|
@mkdir -p $(dir $@)
|
|
$(hide) $(ANDROID_MANIFEST_MERGER) --main $< \
|
|
--libs $(call normalize-path-list,$(PRIVATE_LIBS_MANIFESTS)) \
|
|
--out $@
|
|
else
|
|
fixed_android_manifest := $(full_android_manifest)
|
|
endif
|
|
|
|
$(fixed_android_manifest): PRIVATE_MIN_SDK_VERSION := $(call module-min-sdk-version)
|
|
$(fixed_android_manifest): PRIVATE_TARGET_SDK_VERSION := $(call module-target-sdk-version)
|
|
|
|
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): $(my_exported_sdk_libs_file)
|
|
|
|
my_manifest_fixer_flags :=
|
|
ifneq ($(LOCAL_MODULE_CLASS),APPS)
|
|
my_manifest_fixer_flags += --library
|
|
endif
|
|
ifeq ($(LOCAL_PRIVATE_PLATFORM_APIS),true)
|
|
my_manifest_fixer_flags += --uses-non-sdk-api
|
|
endif
|
|
|
|
ifeq (true,$(LOCAL_USE_EMBEDDED_DEX))
|
|
my_manifest_fixer_flags += --use-embedded-dex
|
|
endif
|
|
|
|
ifeq ($(LOCAL_MODULE_CLASS),APPS)
|
|
ifeq (true,$(call math_gt_or_eq,$(patsubst $(PLATFORM_VERSION_CODENAME),100,$(call module-min-sdk-version)),23))
|
|
ifeq (true,$(LOCAL_USE_EMBEDDED_NATIVE_LIBS))
|
|
my_manifest_fixer_flags += --extract-native-libs=false
|
|
else
|
|
my_manifest_fixer_flags += --extract-native-libs=true
|
|
endif
|
|
else ifeq (true,$(LOCAL_USE_EMBEDDED_NATIVE_LIBS))
|
|
$(call pretty-error,LOCAL_USE_EMBEDDED_NATIVE_LIBS is set but minSdkVersion $(call module-min-sdk-version) does not support it)
|
|
endif
|
|
endif
|
|
|
|
$(fixed_android_manifest): PRIVATE_MANIFEST_FIXER_FLAGS := $(my_manifest_fixer_flags)
|
|
# These two libs are added as optional dependencies (<uses-library> with
|
|
# android:required set to false). This is because they haven't existed in pre-P
|
|
# devices, but classes in them were in bootclasspath jars, etc. So making them
|
|
# hard dependencies (andriod:required=true) would prevent apps from being
|
|
# installed to such legacy devices.
|
|
$(fixed_android_manifest): PRIVATE_OPTIONAL_SDK_LIB_NAMES := android.test.base android.test.mock
|
|
$(fixed_android_manifest): $(MANIFEST_FIXER)
|
|
$(fixed_android_manifest): $(main_android_manifest)
|
|
echo $(PRIVATE_OPTIONAL_SDK_LIB_NAMES) | tr ' ' '\n' > $(PRIVATE_EXPORTED_SDK_LIBS_FILE).optional
|
|
@echo "Fix manifest: $@"
|
|
$(MANIFEST_FIXER) \
|
|
--minSdkVersion $(PRIVATE_MIN_SDK_VERSION) \
|
|
--targetSdkVersion $(PRIVATE_TARGET_SDK_VERSION) \
|
|
--raise-min-sdk-version \
|
|
$(PRIVATE_MANIFEST_FIXER_FLAGS) \
|
|
$(if (PRIVATE_EXPORTED_SDK_LIBS_FILE),\
|
|
$$(cat $(PRIVATE_EXPORTED_SDK_LIBS_FILE) | grep -v -f $(PRIVATE_EXPORTED_SDK_LIBS_FILE).optional | sort -u | sed -e 's/^/\ --uses-library\ /' | tr '\n' ' ') \
|
|
$$(cat $(PRIVATE_EXPORTED_SDK_LIBS_FILE) | grep -f $(PRIVATE_EXPORTED_SDK_LIBS_FILE).optional | sort -u | sed -e 's/^/\ --optional-uses-library\ /' | tr '\n' ' ') \
|
|
) \
|
|
$< $@
|
|
rm $(PRIVATE_EXPORTED_SDK_LIBS_FILE).optional
|