summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorXia Wang <xiaw@google.com>2011-08-31 09:26:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-31 09:26:34 -0700
commitbc82a96491d545b4a2a44ff536bd4f06b724372d (patch)
treeb46c0d6b80fdfc84f8359eea68ae03f278f37985 /libs
parentcf6d4ad5096af4de5faf2e63b14a500188a65e9d (diff)
parent4c875166c8d186de29e254c28261ac576930ab98 (diff)
downloadframeworks_native-bc82a96491d545b4a2a44ff536bd4f06b724372d.zip
frameworks_native-bc82a96491d545b4a2a44ff536bd4f06b724372d.tar.gz
frameworks_native-bc82a96491d545b4a2a44ff536bd4f06b724372d.tar.bz2
Merge "Integreate surfacetexture test into our continuous test framework."
Diffstat (limited to 'libs')
-rw-r--r--libs/gui/tests/Android.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/libs/gui/tests/Android.mk b/libs/gui/tests/Android.mk
index 0308af3..55ac133 100644
--- a/libs/gui/tests/Android.mk
+++ b/libs/gui/tests/Android.mk
@@ -1,4 +1,4 @@
-# Build the unit tests.
+# Build the unit tests,
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -22,17 +22,15 @@ LOCAL_SHARED_LIBRARIES := \
libui \
libutils \
-LOCAL_STATIC_LIBRARIES := \
- libgtest \
- libgtest_main \
-
LOCAL_C_INCLUDES := \
bionic \
bionic/libstdc++/include \
external/gtest/include \
external/stlport/stlport \
-include $(BUILD_EXECUTABLE)
+# Build the binary to $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)
+# to integrate with auto-test framework.
+include $(BUILD_NATIVE_TEST)
# Include subdirectory makefiles
# ============================================================