Merge "Revert^3 "Rename build/make/target/board/Android.mk to android-info.mk and include it in main.mk directly"" into main
diff --git a/core/main.mk b/core/main.mk
index ce066cb..5142adc 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -305,9 +305,6 @@
# Create necessary directories and symlinks in the root filesystem
include system/core/rootdir/create_root_structure.mk
-# Rules to create android-info.txt and device sku manifest files
-include build/make/target/board/android-info.mk
-
endif # dont_bother
ifndef subdir_makefiles_total
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