commit 8527e4726168d271fc9893280f5093ce34f66b42
author Greg Hartman <ghartman@google.com> Mon Nov 02 13:08:12 2015 -0800
committer Greg Hartman <ghartman@google.com> Tue Nov 03 23:12:59 2015 +0000
tree f91fab891ec66f1820d9d65981dc5b77483a34ba
parent 96c91698c418631504aea81727d96ce255a6b34c

Ensure that make reaches deep enough in the tree.

Change-Id: I2940ff65144f001d811b069b3e017b0849f310d1
Reviewed-on: https://swiftshader-review.googlesource.com/4201
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index 9d6f3b8..be29698 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -101,3 +101,7 @@
 LOCAL_CFLAGS := $(COMMON_CFLAGS) -UNDEBUG -g -O0 -DDEFAULT_THREAD_COUNT=1
 LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
 include $(BUILD_STATIC_LIBRARY)
+
+ifneq ($(filter gce_x86 gce calypso, $(TARGET_DEVICE)),)
+include $(call all-makefiles-under,$(LOCAL_PATH))
+endif