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

Commit ea71c968 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Soong: Read Android.soong.mk if skipping Android.mk"

parents ac33935a 5b188fb5

core/definitions.mk

+4 −1
Original line number Diff line number Diff line
@@ -144,7 +144,10 @@ ifeq ($(USE_SOONG),true) 
define filter-soong-makefiles

$(foreach mk,$(1),\

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

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

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

      $(info skipping $(mk), but including Android.soong.mk ...)\

        $(patsubst %/Android.mk,%/Android.soong.mk,$(mk)),\

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

    $(mk)))

endef

else