Commit 0c876107 authored Nov 13, 2024 by Wei Li Committed by Automerger Merge Worker Nov 13, 2024

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

Merge "Revert^6 "Rename build/make/target/board/Android.mk to android-info.mk and include it in main.mk directly"" into main am: 92e7f012 am: 61e78ed2

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

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

core/main.mk

+4 −1

Original line number	Diff line number	Diff line
		@@ -277,7 +277,10 @@ 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)
		subdir_makefiles := \
		$(SOONG_OUT_DIR)/installs-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk \
		$(SOONG_ANDROID_MK) \
		build/make/target/board/android-info.mk

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

+0 −0

File moved.