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

Commit e1b4f302 authored by Colin Cross's avatar Colin Cross
Browse files

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 00a6348e7dfa4fafc308ab92d8e7d06dcfcd01ba)
parent 6021800c

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -479,6 +479,9 @@ $(call add-clean-step, rm -rf $(TARGET_COMMON_OUT_ROOT)/obj_asan/JAVA_LIBRARIES/ 
# Remove stale init.noenforce.rc

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/gsi/init.noenforce.rc)



# 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

# ************************************************

core/android_manifest.mk

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



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): $(ANDROID_MANIFEST_MERGER_CLASSPATH)

$(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_files)