Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 548f637f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert^7 "Rename build/make/target/board/Android.mk to a...""... 

Merge "Revert "Revert^7 "Rename build/make/target/board/Android.mk to a..."" into main am: 928fa229

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



Change-Id: I737d97b5fbf730f2b48c46d82948d5dd403c0156
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08fcdef1 928fa229

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)