commit e124e94ee9f3cf5a51b4a21f0c536d0d4e00e0d4
author Xia Wang <xiaw@google.com> Wed Aug 31 09:26:34 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 31 09:26:34 2011 -0700
tree 96a2ff948fd9db993c40859244baf5c11668fafc
parent 2e2626f6c6404a0ce6c7d63b912a3ec2c748008d
parent 1d4274eb4c5300f1794f0f3eb4bbcaae992c9611

Merge "Integreate surfacetexture test into our continuous test framework."

libs/gui/tests/Android.mk

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 @@
 	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
 # ============================================================