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

Commit 946a08cf authored by Colin Cross's avatar Colin Cross
Browse files

Ignore Android.mk files with USE_SOONG=true 

When USE_SOONG=true, ignore any Android.mk file that has an Android.bp
file in the same directory.

Change-Id: Id79bd90c2aed5dafc2f8ad2c5b7eb0aa6e81dc18
(cherry picked from commit 861ab995)
parent 6bc1d303

core/definitions.mk

+22 −4
Original line number Diff line number Diff line
@@ -142,12 +142,28 @@ $(strip \ 
 )

endef



###########################################################

## Remove any makefiles that are being handled by soong

###########################################################

ifeq ($(USE_SOONG),true)

define filter-soong-makefiles

$(foreach mk,$(1),\

  $(if $(wildcard $(patsubst %/Android.mk,%/Android.bp,$(mk))),\

    $(info skipping $(mk) ...),\

    $(mk)))

endef

else

define filter-soong-makefiles

$(1)

endef

endif



###########################################################

## Retrieve a list of all makefiles immediately below some directory

###########################################################



define all-makefiles-under

$(sort $(wildcard $(1)/*/Android.mk))

$(sort $(call filter-soong-makefiles,$(wildcard $(1)/*/Android.mk)))

endef



###########################################################
@@ -158,8 +174,9 @@ endef 
# $(1): directory to search under

# Ignores $(1)/Android.mk

define first-makefiles-under

$(call filter-soong-makefiles,\

  $(shell build/tools/findleaves.py $(FIND_LEAVES_EXCLUDES) \

        --mindepth=2 $(1) Android.mk)

        --mindepth=2 $(1) Android.mk))

endef



###########################################################
@@ -179,7 +196,8 @@ endef 


# $(1): List of directories to look for under this directory

define all-named-subdir-makefiles

$(sort $(wildcard $(addsuffix /Android.mk, $(addprefix $(call my-dir)/,$(1)))))

$(sort $(call filter-soong-makefiles,\

  $(wildcard $(addsuffix /Android.mk, $(addprefix $(call my-dir)/,$(1))))))

endef



###########################################################

core/main.mk

+3 −2
Original line number Diff line number Diff line
@@ -539,8 +539,9 @@ ifneq ($(dont_bother),true) 
# --mindepth=2 makes the prunes not work.

subdir_makefiles := \

	$(shell build/tools/findleaves.py $(FIND_LEAVES_EXCLUDES) $(subdirs) Android.mk)



ifeq ($(USE_SOONG),true)

subdir_makefiles := $(SOONG_ANDROID_MK) $(subdir_makefiles)

subdir_makefiles := $(SOONG_ANDROID_MK) $(call filter-soong-makefiles,$(subdir_makefiles))

endif



$(foreach mk, $(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))