summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/gui/Android.mk4
-rw-r--r--libs/gui/tests/Android.mk3
2 files changed, 4 insertions, 3 deletions
diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index 58bb0d31f4..b5737ffff1 100644
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -38,3 +38,7 @@ ifeq ($(TARGET_SIMULATOR),true)
endif
include $(BUILD_SHARED_LIBRARY)
+
+ifeq (,$(ONE_SHOT_MAKEFILE))
+include $(call first-makefiles-under,$(LOCAL_PATH))
+endif
diff --git a/libs/gui/tests/Android.mk b/libs/gui/tests/Android.mk
index ecd0995115..8d3a9b5eba 100644
--- a/libs/gui/tests/Android.mk
+++ b/libs/gui/tests/Android.mk
@@ -36,9 +36,6 @@ LOCAL_C_INCLUDES := \
include $(BUILD_EXECUTABLE)
-# Build the manual test programs.
-include $(call all-subdir-makefiles)
-
endif
# Include subdirectory makefiles