commit 2ae7f4bc820d7b50e55b340e776bfe0747830bfc
author Hongguang Chen <hgchen@google.com> Tue Nov 12 00:36:39 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 12 00:36:39 2024 +0000
tree f95726e93fe063a48ba9f75cbd6d68f1c1f0281a
parent 4c12368a7c95184b41c71efc48e61769e4e1cc17

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

This reverts commit 4c12368a7c95184b41c71efc48e61769e4e1cc17.

Reason for revert: b/378552546

Change-Id: Ib07f4d4bd6e54c09e2531b2c84aaf78854b2e381

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 214d9a0..5142adc 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -268,9 +268,6 @@
 $(error done)
 endef
 
-# Rules to create android-info.txt and device sku manifest files
-include build/make/target/board/android-info.mk
-
 subdir_makefiles_inc := .
 FULL_BUILD :=
 

target/board/Android.mk

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