StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2016-05-13 23:52:07 +00:00
committed by Gerrit Code Review
parent ac33935ac1 5b188fb539
commit ea71c96894
1 changed files with 4 additions and 1 deletions
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 define filter-soong-makefiles
$(foreach mk,$(1),\ $(foreach mk,$(1),\
$(if $(wildcard $(patsubst %/Android.mk,%/Android.bp,$(mk))),\ $(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))) $(mk)))
endef endef
else else