Merge "libgui: enable tests in the 'tests' build."

2011-04-28 15:03:56 -07:00 · 2011-04-28 15:03:56 -07:00 · 39a01c6694
commit 39a01c6694
parent faf66ad13f 7fcb077c55
2 changed files with 4 additions and 3 deletions
--- 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
--- 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