diff options
| author | 2011-04-28 15:03:56 -0700 | |
|---|---|---|
| committer | 2011-04-28 15:03:56 -0700 | |
| commit | 39a01c66947cd56c80ff406c277d9debc0efa7cc (patch) | |
| tree | 927ca1a21266143c9eba30bae643a7be932cd1d4 | |
| parent | faf66ad13f93a6da46c6b562c02efcc926ed2c70 (diff) | |
| parent | 7fcb077c5522c56e266947e073c8750019e5a98a (diff) | |
Merge "libgui: enable tests in the 'tests' build."
| -rw-r--r-- | libs/gui/Android.mk | 4 | ||||
| -rw-r--r-- | libs/gui/tests/Android.mk | 3 |
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 |