Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcc1ae07 authored by Dan Albert's avatar Dan Albert
Browse files

Move hwc tests to libc++. 

Since these tests were pulling in a static library linked against
stlport, the tests needed to be explicit about which STL they're
using. Might as well be libc++.

Bug: 15193147
Change-Id: I4e0fc4ea10f7982dd04e7baaf57139dd5d55543e
parent dbab409c

opengl/tests/hwc/Android.mk

+28 −34
Original line number Original line Diff line number Diff line
@@ -16,19 +16,24 @@ LOCAL_PATH:= $(call my-dir) 




include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_MODULE_TAGS := tests

LOCAL_MODULE_TAGS := tests

LOCAL_MODULE:= libhwcTest

LOCAL_MODULE:= libhwcTest

LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES

LOCAL_CXX_STL := libc++

LOCAL_SRC_FILES:= hwcTestLib.cpp

LOCAL_SRC_FILES:= hwcTestLib.cpp

LOCAL_C_INCLUDES += system/extras/tests/include \

LOCAL_C_INCLUDES += system/extras/tests/include \

	$(call include-path-for, opengl-tests-includes)

    $(call include-path-for, opengl-tests-includes) \



LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES





include external/stlport/libstlport.mk

include $(BUILD_STATIC_LIBRARY)

include $(BUILD_STATIC_LIBRARY)





include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

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_SRC_FILES:= hwcStress.cpp





LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \
@@ -48,20 +53,17 @@ LOCAL_STATIC_LIBRARIES := \ 
LOCAL_C_INCLUDES += \

LOCAL_C_INCLUDES += \

    system/extras/tests/include \

    system/extras/tests/include \

    hardware/libhardware/include \

    hardware/libhardware/include \

	$(call include-path-for, opengl-tests-includes)

    $(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





include $(BUILD_NATIVE_TEST)

include $(BUILD_NATIVE_TEST)





include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

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_SRC_FILES:= hwcRects.cpp





LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \
@@ -81,18 +83,17 @@ LOCAL_STATIC_LIBRARIES := \ 
LOCAL_C_INCLUDES += \

LOCAL_C_INCLUDES += \

    system/extras/tests/include \

    system/extras/tests/include \

    hardware/libhardware/include \

    hardware/libhardware/include \

	$(call include-path-for, opengl-tests-includes)

    $(call include-path-for, opengl-tests-includes) \



LOCAL_MODULE:= hwcRects



LOCAL_MODULE_TAGS := tests



LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES





include $(BUILD_NATIVE_TEST)

include $(BUILD_NATIVE_TEST)





include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

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_SRC_FILES:= hwcColorEquiv.cpp





LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \
@@ -112,18 +113,17 @@ LOCAL_STATIC_LIBRARIES := \ 
LOCAL_C_INCLUDES += \

LOCAL_C_INCLUDES += \

    system/extras/tests/include \

    system/extras/tests/include \

    hardware/libhardware/include \

    hardware/libhardware/include \

	$(call include-path-for, opengl-tests-includes)

    $(call include-path-for, opengl-tests-includes) \



LOCAL_MODULE:= hwcColorEquiv



LOCAL_MODULE_TAGS := tests



LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES





include $(BUILD_NATIVE_TEST)

include $(BUILD_NATIVE_TEST)





include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

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_SRC_FILES:= hwcCommit.cpp





LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \
@@ -143,12 +143,6 @@ LOCAL_STATIC_LIBRARIES := \ 
LOCAL_C_INCLUDES += \

LOCAL_C_INCLUDES += \

    system/extras/tests/include \

    system/extras/tests/include \

    hardware/libhardware/include \

    hardware/libhardware/include \

	$(call include-path-for, opengl-tests-includes)

    $(call include-path-for, opengl-tests-includes) \



LOCAL_MODULE:= hwcCommit



LOCAL_MODULE_TAGS := tests



LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES





include $(BUILD_NATIVE_TEST)
 
include $(BUILD_NATIVE_TEST)

opengl/tests/hwc/hwcTestLib.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -20,17 +20,18 @@ 
 * Utility library functions for use by the Hardware Composer test cases

 * Utility library functions for use by the Hardware Composer test cases

 */

 */





#include <arpa/inet.h> // For ntohl() and htonl()



#include <cmath>

#include <sstream>

#include <sstream>

#include <string>

#include <string>





#include <arpa/inet.h> // For ntohl() and htonl()



#include "hwcTestLib.h"

#include "hwcTestLib.h"





#include "EGLUtils.h"

#include "EGLUtils.h"





// Defines

// Defines

#define NUMA(a) (sizeof(a) / sizeof(a [0]))

#define NUMA(a) (sizeof(a) / sizeof((a)[0]))





// Function Prototypes

// Function Prototypes

static void printGLString(const char *name, GLenum s);

static void printGLString(const char *name, GLenum s);