commit ea71c968943209f41191a1f164f899dd002b9119
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 13 23:52:07 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 13 23:52:08 2016 +0000
tree d9465100e756dc0fc6bbe23951643c7fc471fa0a
parent ac33935ac1721c640ce39b722cb7471ea9a5949d
parent 5b188fb53903a0ac2b286a922e16561df9aaa80a

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

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index d5840b8..57aa7b6 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -144,7 +144,10 @@
 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