commit 3a6004bd501a62f8494f1f91500fe06fe110068d
author Wei Li <weiwli@google.com> Fri Nov 08 20:36:46 2024 +0000
committer Wei Li <weiwli@google.com> Tue Nov 12 08:54:27 2024 +0000
tree dd30d42d1f623915655e5b627386cafc58334883
parent 7beb2529b6206f2334a29d8c357841735cfbb234

Add PRODUCT_IGNORE_ALL_ANDROIDMK to ignore Android.mk files

PRODUCT_ALLOWED_ANDROIDMK_FILES can be used for products that still have some Android.mk files that need to be included.

PRODUCT_ANDROIDMK_ALLOWLIST_FILE can be used to allowlist Android.mk files that are not in AOSP.

Bug: 318428689
Test: lunch aosp_cf_x86_64_phone-trunk_staging-eng && m
Test: CIs
Change-Id: Ie64040608c795a949e3d7af45f176209c6d01d9a

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 5142adc..83d42af 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -281,7 +281,17 @@
 
 # Android.mk files are only used on Linux builds, Mac only supports Android.bp
 ifeq ($(HOST_OS),linux)
-  subdir_makefiles += $(file <$(OUT_DIR)/.module_paths/Android.mk.list)
+  ifeq ($(PRODUCT_IGNORE_ALL_ANDROIDMK),true)
+    allowed_androidmk_files :=
+    ifdef PRODUCT_ANDROIDMK_ALLOWLIST_FILE
+      -include $(PRODUCT_ANDROIDMK_ALLOWLIST_FILE)
+    endif
+    allowed_androidmk_files += $(PRODUCT_ALLOWED_ANDROIDMK_FILES)
+    subdir_makefiles += $(filter $(allowed_androidmk_files),$(file <$(OUT_DIR)/.module_paths/Android.mk.list))
+    allowed_androidmk_files :=
+  else
+    subdir_makefiles += $(file <$(OUT_DIR)/.module_paths/Android.mk.list)
+  endif
 endif
 
 subdir_makefiles += $(SOONG_OUT_DIR)/late-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk