Commit ccb4651a authored Dec 11, 2024 by Wei Li Committed by Automerger Merge Worker Dec 11, 2024

Merge "Revert^7 "Rename build/make/target/board/Android.mk to android-info.mk...

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

Original change: https://android-review.googlesource.com/c/platform/build/+/3407461

Change-Id: I79ef07694e40f4be669c9143ea774bedef1c62e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/main.mk

+1 −4

Original line number	Diff line number	Diff line
		@@ -277,10 +277,7 @@ FULL_BUILD := true
		# Include all of the makefiles in the system
		#

		subdir_makefiles := \
		$(SOONG_OUT_DIR)/installs-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk \
		$(SOONG_ANDROID_MK) \
		build/make/target/board/android-info.mk
		subdir_makefiles := $(SOONG_OUT_DIR)/installs-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk $(SOONG_ANDROID_MK)

		# Android.mk files are only used on Linux builds, Mac only supports Android.bp
		ifeq ($(HOST_OS),linux)

+0 −0

File moved.