Revert^7 "Rename build/make/target/board/Android.mk to android-info.mk and include it in main.mk directly"
This reverts commit 06924ce15756bea313a423add90982273fada857.
Reason for revert: b/381446065
Change-Id: If3230364e8a53743a6f3930128c077a6db61684b
diff --git a/core/main.mk b/core/main.mk
index f96cf04..83d42af 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