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

2016-05-13 23:52:07 +00:00
parent ac33935ac1 5b188fb539
commit ea71c96894
1 changed files with 4 additions and 1 deletions
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -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