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

Commit 0ec4fd79 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Move merged AndroidManifest.xml file to manifest subdirectory 

am: c7dee5c9

Change-Id: Icf49bdf5f4f2b469ce17b3fc427ea3a8ffc7e5eb
parents be82c3f8 c7dee5c9

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)