Merge "Revert^7 "Rename build/make/target/board/Android.mk to android-info.mk and include it in main.mk directly"" into main am: 31ae396963
Original change: https://android-review.googlesource.com/c/platform/build/+/3407461
Change-Id: I79ef07694e40f4be669c9143ea774bedef1c62e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/main.mk b/core/main.mk
index 624df49..4b76971 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -277,10 +277,7 @@
# Include all of the makefiles in the system
#
-subdir_makefiles := \
- $(SOONG_OUT_DIR)/installs-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk \
- $(SOONG_ANDROID_MK) \
- build/make/target/board/android-info.mk
+subdir_makefiles := $(SOONG_OUT_DIR)/installs-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk $(SOONG_ANDROID_MK)
# Android.mk files are only used on Linux builds, Mac only supports Android.bp
ifeq ($(HOST_OS),linux)
diff --git a/target/board/android-info.mk b/target/board/Android.mk
similarity index 100%
rename from target/board/android-info.mk
rename to target/board/Android.mk