commit 61995cb5f33ead8556fd985800409e8863a251db
author Wei Li <weiwli@google.com> Mon Dec 16 11:53:35 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 16 11:53:35 2024 -0800
tree 6cde91cc57859127e3c5298dd15152587e9873e5
parent 509d2f6675fce72acc81b56ad7615f06f3434b6a

Revert "Revert^7 "Rename build/make/target/board/Android.mk to a..."

Revert submission 3407461-revert-android-info-mk

Reason for revert: see b/381446065#comment27, not the root cause

Reverted changes: /q/submissionid:3407461-revert-android-info-mk

Change-Id: Ib2c1c3813a64390c5ab82b53d124fe0c073c1c5a

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 83d42af..f96cf04 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -277,7 +277,10 @@
 # Include all of the makefiles in the system
 #
 
-subdir_makefiles := $(SOONG_OUT_DIR)/installs-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk $(SOONG_ANDROID_MK)
+subdir_makefiles := \
+    $(SOONG_OUT_DIR)/installs-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk \
+    $(SOONG_ANDROID_MK) \
+    build/make/target/board/android-info.mk
 
 # Android.mk files are only used on Linux builds, Mac only supports Android.bp
 ifeq ($(HOST_OS),linux)