Revert^2 "Rename build/make/target/board/Android.mk to android-info.mk and include it in main.mk directly"
This reverts commit 8cce56672e88a9f4d864ae64d728a8574f83e6b7.
Reason for revert: not the root cause of the breakage.
Change-Id: I1df23198fd5956454f01b47d0e8e313de151416a
diff --git a/core/main.mk b/core/main.mk
index 5142adc..ce066cb 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -305,6 +305,9 @@
# 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.mk b/target/board/android-info.mk
similarity index 100%
rename from target/board/Android.mk
rename to target/board/android-info.mk