summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hongguang Chen <hgchen@google.com> 2024-11-12 00:36:39 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-11-12 00:36:39 +0000
commit2ae7f4bc820d7b50e55b340e776bfe0747830bfc (patch)
treef95726e93fe063a48ba9f75cbd6d68f1c1f0281a
parent4c12368a7c95184b41c71efc48e61769e4e1cc17 (diff)
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
-rw-r--r--core/main.mk3
-rw-r--r--target/board/Android.mk (renamed from target/board/android-info.mk)0
2 files changed, 0 insertions, 3 deletions
diff --git a/core/main.mk b/core/main.mk
index 214d9a0b90..5142adc759 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -268,9 +268,6 @@ $(shell $(call echo-error,$(LOCAL_MODULE_MAKEFILE),$(LOCAL_MODULE): $(1)))
$(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 :=
diff --git a/target/board/android-info.mk b/target/board/Android.mk
index 36be0025ad..36be0025ad 100644
--- a/target/board/android-info.mk
+++ b/target/board/Android.mk