p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

If Soong is enabled, and we're skipping an Android.mk because there is
an Android.bp file, check for an Android.soong.mk file and read that
instead. This will allow us to temporarily define modules or recurse
into subdirectories that soong does not yet support.

Change-Id: Ifdb2f0204a38a5069e53527f66ffcfb8008c11a4
This commit is contained in:
Dan Willemsen 2016-05-13 15:58:52 -07:00
parent ac33935ac1
commit 5b188fb539
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/definitions.mk
View File

@ -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