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

Commit 31ae3969 authored by Wei Li's avatar Wei Li Committed by Gerrit Code Review
Browse files

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
parents a645e3d9 509d2f66
Loading
Loading
Loading
Loading
+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)