diff options
| author | 2011-04-26 17:26:37 -0700 | |
|---|---|---|
| committer | 2011-04-26 17:26:37 -0700 | |
| commit | 8f9f2fd43b95ef250d74ba95baf32fd13ca2bff5 (patch) | |
| tree | 61e5301ecd28724e55902c547d3d0e833da5138e | |
| parent | a5679c8ad4242b08f09cb2a6573a9a1218d7064c (diff) | |
libgui: enable tests in the 'tests' build.
This change makes the libgui makefile recurse into the tests directory
so that the tests get built by a top-level make when
TARGET_BUILD_VARIANT=tests.
Change-Id: I6f623cc4b86dfeb00b9d21823316dbd9def23110
| -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 58bb0d31f4e2..b5737ffff18f 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 ecd09951153e..8d3a9b5ebafa 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 |