commit 524f6d01ddf78040479b83da6018eb75da90f6d6
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Nov 12 01:43:21 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 12 01:43:21 2024 +0000
tree cd5e74f741f591e619daaa5f0bb702e3858c948e
parent 22951ce81e4ec85d4c77ac20cdb5b484da5457a6
parent 2ae7f4bc820d7b50e55b340e776bfe0747830bfc

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

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