commit 06924ce15756bea313a423add90982273fada857
author Wei Li <weiwli@google.com> Tue Nov 12 22:27:22 2024 +0000
committer Wei Li <weiwli@google.com> Tue Nov 12 22:28:09 2024 +0000
tree 6cde91cc57859127e3c5298dd15152587e9873e5
parent 4e9d7b3cc1dcfbe4c050b5fd7a6afa792ae07d15

Revert^6 "Rename build/make/target/board/Android.mk to android-info.mk and include it in main.mk directly"

This reverts commit 2ae7f4bc820d7b50e55b340e776bfe0747830bfc.

Reason for revert: not the root cause.

Change-Id: I58c7ee0095b2c6a3c89513981a25568dfacc067c

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)