From 0f82be69c56063f2f5d444508d22fe6a2cb25d02 Mon Sep 17 00:00:00 2001
From: Yumi Yukimura <me.cafebabe@gmail.com>
Date: Mon, 25 Aug 2025 01:43:51 +0800
Subject: [PATCH] lineage: Move build-manifest.xml build rule into
 `build/tasks`

* For Android.mk deprecation

Change-Id: I4aba949ae0af7674955d7a2c439d191348b41f3c
---
 build/core/default_installed_modules.mk         |  3 +++
 build/core/definitions.mk                       |  3 +++
 .../tasks/build-manifest_xml.mk                 | 17 ++++-------------
 config/common.mk                                |  4 ----
 4 files changed, 10 insertions(+), 17 deletions(-)
 create mode 100644 build/core/default_installed_modules.mk
 rename config/Android.mk => build/tasks/build-manifest_xml.mk (62%)

diff --git a/build/core/default_installed_modules.mk b/build/core/default_installed_modules.mk
new file mode 100644
index 00000000..1f5ba40c
--- /dev/null
+++ b/build/core/default_installed_modules.mk
@@ -0,0 +1,3 @@
+# build-manifest.xml
+INSTALLED_BUILD_MANIFEST_XML_TARGET := $(TARGET_OUT_PRODUCT)/etc/build-manifest.xml
+ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_BUILD_MANIFEST_XML_TARGET)
diff --git a/build/core/definitions.mk b/build/core/definitions.mk
index 08cce99d..4eecee62 100644
--- a/build/core/definitions.mk
+++ b/build/core/definitions.mk
@@ -7,3 +7,6 @@ endef
 
 # Include board/platform macros
 include vendor/lineage/build/core/utils.mk
+
+# Include default installed modules
+include vendor/lineage/build/core/default_installed_modules.mk
diff --git a/config/Android.mk b/build/tasks/build-manifest_xml.mk
similarity index 62%
rename from config/Android.mk
rename to build/tasks/build-manifest_xml.mk
index 90ce7831..54a6f1bb 100644
--- a/config/Android.mk
+++ b/build/tasks/build-manifest_xml.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2023 The LineageOS Project
+# Copyright (C) 2023-2025 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,18 +16,9 @@ ifdef MANIFEST_EXCLUDES
 MANIFEST_EXCLUDES := |$(MANIFEST_EXCLUDES)
 endif
 
-include $(CLEAR_VARS)
-
-LOCAL_MODULE         := build-manifest
-LOCAL_MODULE_SUFFIX  := .xml
-LOCAL_MODULE_CLASS   := ETC
-LOCAL_PRODUCT_MODULE := true
-
-_build-manifest_intermediates := $(call intermediates-dir-for,$(LOCAL_MODULE_CLASS),$(LOCAL_MODULE))
-_build-manifest_xml := $(_build-manifest_intermediates)/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
-
-$(_build-manifest_xml):
+$(INSTALLED_BUILD_MANIFEST_XML_TARGET):
 	mkdir -p $(dir $@)
 	python3 .repo/repo/repo manifest -o - -r | grep -Ev "proprietary_$(MANIFEST_EXCLUDES)" > $@
 
-include $(BUILD_SYSTEM)/base_rules.mk
+.PHONY: build-manifest.xml
+build-manifest.xml: $(INSTALLED_BUILD_MANIFEST_XML_TARGET)
diff --git a/config/common.mk b/config/common.mk
index 66d0be14..cb20c8c0 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -145,10 +145,6 @@ ifneq ($(TARGET_DISABLE_EPPE),true)
 $(call enforce-product-packages-exist-internal,$(lastword $(_include_stack)),product_manifest.xml rild Calendar android.hidl.memory@1.0-impl.vendor vndk_apex_snapshot_package)
 endif
 
-# Build Manifest
-PRODUCT_PACKAGES += \
-    build-manifest.xml
-
 # Lineage packages
 ifeq ($(PRODUCT_IS_ATV),)
 PRODUCT_PACKAGES += \