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

Commit c7dee5c9 authored Jun 12, 2018 by Colin Cross

Move merged AndroidManifest.xml file to manifest subdirectory

Some modules generate their own custom AndroidManifest.xml file
to $(intermediates.COMMON)/AndroidManifest.xml file.  Move the
build system's location to
$(intermediates.COMMON)/manifest/AndroidManifest.xml.

This location will also be used later for finding manifest files
from LOCAL_STATIC_ANDROID_LIBRARIES dependencies.

Bug: 78447299
Test: m checkbuild
Change-Id: I345f079bdd191451333b38d882418f2f7150b1e9
Merged-In: I345f079bdd191451333b38d882418f2f7150b1e9
(cherry picked from commit 0bcc120b)

parent 830cb4e8

CleanSpec.mk

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -488,6 +488,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher3)
	$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Launcher3)		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Launcher3)
	$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher3_intermediates)		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher3_intermediates)

			# Remove old merged AndroidManifest.xml location
			$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS/*_intermediates/AndroidManifest.xml)

	# ************************************************		# ************************************************
	# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
	# ************************************************		# ************************************************

core/android_manifest.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ endif # LOCAL_STATIC_JAVA_AAR_LIBRARIES
	ifneq (,$(strip $(my_full_libs_manifest_files)))		ifneq (,$(strip $(my_full_libs_manifest_files)))

	main_android_manifest := $(full_android_manifest)		main_android_manifest := $(full_android_manifest)
	full_android_manifest := $(intermediates.COMMON)/AndroidManifest.xml		full_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml
	$(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files)		$(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files)
	$(full_android_manifest): $(ANDROID_MANIFEST_MERGER_CLASSPATH)		$(full_android_manifest): $(ANDROID_MANIFEST_MERGER_CLASSPATH)
	$(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_files)		$(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_files)