am d284c4cd: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."

* commit 'd284c4cd78e0d42a8ee7af6e8f61c5e66cae6318':
  Don't set LOCAL_MODULE_PATH for native tests.
This commit is contained in:
Ying Wang 2014-06-09 23:00:04 +00:00 committed by Android Git Automerger
commit 0cea0a2210

View File

@ -57,7 +57,6 @@ LOCAL_C_INCLUDES += \
LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
LOCAL_MODULE:= hwcStress LOCAL_MODULE:= hwcStress
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativestresstest
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
@ -88,7 +87,6 @@ LOCAL_C_INCLUDES += \
$(call include-path-for, opengl-tests-includes) $(call include-path-for, opengl-tests-includes)
LOCAL_MODULE:= hwcRects LOCAL_MODULE:= hwcRects
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativeutil
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
@ -119,7 +117,6 @@ LOCAL_C_INCLUDES += \
$(call include-path-for, opengl-tests-includes) $(call include-path-for, opengl-tests-includes)
LOCAL_MODULE:= hwcColorEquiv LOCAL_MODULE:= hwcColorEquiv
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativeutil
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
@ -150,7 +147,6 @@ LOCAL_C_INCLUDES += \
$(call include-path-for, opengl-tests-includes) $(call include-path-for, opengl-tests-includes)
LOCAL_MODULE:= hwcCommit LOCAL_MODULE:= hwcCommit
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativebenchmark
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests