summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-06-11 17:58:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-11 17:58:44 +0000
commit722e75179b7775121d8f33c899827ab866e2008b (patch)
treee5d03496844ab4edac750d1a2de8121368193b5a /opengl
parent55fc54970b674280376bbf037153ca1a5e53bc32 (diff)
parent0cea0a22109ace7e3dfbb4913a1469f3f8480f6e (diff)
downloadframeworks_native-722e75179b7775121d8f33c899827ab866e2008b.zip
frameworks_native-722e75179b7775121d8f33c899827ab866e2008b.tar.gz
frameworks_native-722e75179b7775121d8f33c899827ab866e2008b.tar.bz2
am 0cea0a22: am d284c4cd: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."
* commit '0cea0a22109ace7e3dfbb4913a1469f3f8480f6e': Don't set LOCAL_MODULE_PATH for native tests.
Diffstat (limited to 'opengl')
-rw-r--r--opengl/tests/hwc/Android.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/opengl/tests/hwc/Android.mk b/opengl/tests/hwc/Android.mk
index 2fdfcf8..86e1d46 100644
--- a/opengl/tests/hwc/Android.mk
+++ b/opengl/tests/hwc/Android.mk
@@ -57,7 +57,6 @@ LOCAL_C_INCLUDES += \
LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
LOCAL_MODULE:= hwcStress
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativestresstest
LOCAL_MODULE_TAGS := tests
@@ -88,7 +87,6 @@ LOCAL_C_INCLUDES += \
$(call include-path-for, opengl-tests-includes)
LOCAL_MODULE:= hwcRects
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativeutil
LOCAL_MODULE_TAGS := tests
@@ -119,7 +117,6 @@ LOCAL_C_INCLUDES += \
$(call include-path-for, opengl-tests-includes)
LOCAL_MODULE:= hwcColorEquiv
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativeutil
LOCAL_MODULE_TAGS := tests
@@ -150,7 +147,6 @@ LOCAL_C_INCLUDES += \
$(call include-path-for, opengl-tests-includes)
LOCAL_MODULE:= hwcCommit
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativebenchmark
LOCAL_MODULE_TAGS := tests