diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-04-28 15:03:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-28 15:03:56 -0700 |
| commit | ca2773bc456dfaf84685f75c4a20e26269879e87 (patch) | |
| tree | 8a4550f0745e9dd2df01bae25acdad0eb27dc608 /libs/gui | |
| parent | ab036058ac7a07eac113a49a34a02f565700fdd1 (diff) | |
| parent | 8f9f2fd43b95ef250d74ba95baf32fd13ca2bff5 (diff) | |
| download | frameworks_base-ca2773bc456dfaf84685f75c4a20e26269879e87.zip frameworks_base-ca2773bc456dfaf84685f75c4a20e26269879e87.tar.gz frameworks_base-ca2773bc456dfaf84685f75c4a20e26269879e87.tar.bz2 | |
Merge "libgui: enable tests in the 'tests' build."
Diffstat (limited to 'libs/gui')
| -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 58bb0d3..b5737ff 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 ecd0995..8d3a9b5 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 |