diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-05 02:41:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-05 02:41:59 +0000 |
| commit | c90b7d9c0f1df1cec8afbfebad0f111d878113e7 (patch) | |
| tree | fa9e1becb1167cd69a62d7a0ea0c698cd00815e3 /opengl/tests | |
| parent | ac5cd96fe24690d9e0ae823c77334b8579139aa2 (diff) | |
| parent | d12586b8593cf0cb894d02104a9794ed9dd85d16 (diff) | |
| download | frameworks_native-c90b7d9c0f1df1cec8afbfebad0f111d878113e7.zip frameworks_native-c90b7d9c0f1df1cec8afbfebad0f111d878113e7.tar.gz frameworks_native-c90b7d9c0f1df1cec8afbfebad0f111d878113e7.tar.bz2 | |
am d12586b8: Merge "Move hwc tests to libc++."
* commit 'd12586b8593cf0cb894d02104a9794ed9dd85d16':
Move hwc tests to libc++.
Diffstat (limited to 'opengl/tests')
| -rw-r--r-- | opengl/tests/hwc/Android.mk | 62 | ||||
| -rw-r--r-- | opengl/tests/hwc/hwcTestLib.cpp | 7 |
2 files changed, 32 insertions, 37 deletions
diff --git a/opengl/tests/hwc/Android.mk b/opengl/tests/hwc/Android.mk index d7d59c6..f83846b 100644 --- a/opengl/tests/hwc/Android.mk +++ b/opengl/tests/hwc/Android.mk @@ -16,19 +16,24 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + LOCAL_MODULE_TAGS := tests LOCAL_MODULE:= libhwcTest +LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES +LOCAL_CXX_STL := libc++ LOCAL_SRC_FILES:= hwcTestLib.cpp LOCAL_C_INCLUDES += system/extras/tests/include \ - $(call include-path-for, opengl-tests-includes) - -LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES + $(call include-path-for, opengl-tests-includes) \ -include external/stlport/libstlport.mk include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + +LOCAL_MODULE:= hwcStress +LOCAL_MODULE_TAGS := tests +LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES +LOCAL_CXX_STL := libc++ LOCAL_SRC_FILES:= hwcStress.cpp LOCAL_SHARED_LIBRARIES := \ @@ -48,20 +53,17 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_C_INCLUDES += \ system/extras/tests/include \ hardware/libhardware/include \ - $(call include-path-for, opengl-tests-includes) - -LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES - -LOCAL_MODULE:= hwcStress - -LOCAL_MODULE_TAGS := tests - -LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES + $(call include-path-for, opengl-tests-includes) \ include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + +LOCAL_MODULE:= hwcRects +LOCAL_MODULE_TAGS := tests +LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES +LOCAL_CXX_STL := libc++ LOCAL_SRC_FILES:= hwcRects.cpp LOCAL_SHARED_LIBRARIES := \ @@ -81,18 +83,17 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_C_INCLUDES += \ system/extras/tests/include \ hardware/libhardware/include \ - $(call include-path-for, opengl-tests-includes) - -LOCAL_MODULE:= hwcRects - -LOCAL_MODULE_TAGS := tests - -LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES + $(call include-path-for, opengl-tests-includes) \ include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + +LOCAL_MODULE:= hwcColorEquiv +LOCAL_MODULE_TAGS := tests +LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES +LOCAL_CXX_STL := libc++ LOCAL_SRC_FILES:= hwcColorEquiv.cpp LOCAL_SHARED_LIBRARIES := \ @@ -112,18 +113,17 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_C_INCLUDES += \ system/extras/tests/include \ hardware/libhardware/include \ - $(call include-path-for, opengl-tests-includes) - -LOCAL_MODULE:= hwcColorEquiv - -LOCAL_MODULE_TAGS := tests - -LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES + $(call include-path-for, opengl-tests-includes) \ include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + +LOCAL_MODULE:= hwcCommit +LOCAL_MODULE_TAGS := tests +LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES +LOCAL_CXX_STL := libc++ LOCAL_SRC_FILES:= hwcCommit.cpp LOCAL_SHARED_LIBRARIES := \ @@ -143,12 +143,6 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_C_INCLUDES += \ system/extras/tests/include \ hardware/libhardware/include \ - $(call include-path-for, opengl-tests-includes) - -LOCAL_MODULE:= hwcCommit - -LOCAL_MODULE_TAGS := tests - -LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES + $(call include-path-for, opengl-tests-includes) \ include $(BUILD_NATIVE_TEST) diff --git a/opengl/tests/hwc/hwcTestLib.cpp b/opengl/tests/hwc/hwcTestLib.cpp index 7fae5e5..9bad460 100644 --- a/opengl/tests/hwc/hwcTestLib.cpp +++ b/opengl/tests/hwc/hwcTestLib.cpp @@ -20,17 +20,18 @@ * Utility library functions for use by the Hardware Composer test cases */ +#include <arpa/inet.h> // For ntohl() and htonl() + +#include <cmath> #include <sstream> #include <string> -#include <arpa/inet.h> // For ntohl() and htonl() - #include "hwcTestLib.h" #include "EGLUtils.h" // Defines -#define NUMA(a) (sizeof(a) / sizeof(a [0])) +#define NUMA(a) (sizeof(a) / sizeof((a)[0])) // Function Prototypes static void printGLString(const char *name, GLenum s); |