From 0bcc120b548b61cbf746e1417bdfc9cdccd8c9ed Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 12 Jun 2018 14:43:41 -0700
Subject: [PATCH] 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
---
 CleanSpec.mk             | 3 +++
 core/android_manifest.mk | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 767726108d..bb3b04f8b9 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -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 $(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
 # ************************************************
diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index a3861aad76..c8c7333fe0 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -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)