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

Commit c11f2ff4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move merged AndroidManifest.xml file to manifest subdirectory"

parents b6b2d49e e1b4f302

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)