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

Commit 64bf0e4c authored by Tanguy Pruvot's avatar Tanguy Pruvot
Browse files

opengl: remove tegra errata duplicates 

Change-Id: I118ad07cb7b45db1b8b73b79852d5c8956387bc8
parent 710a0db6

opengl/libs/Android.mk

+5 −34
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ LOCAL_SRC_FILES:= \ 
	EGL/trace.cpp              \

	EGL/getProcAddress.cpp.arm \

	EGL/Loader.cpp 	       \

#



LOCAL_SHARED_LIBRARIES += libcutils libutils libGLESv2_dbg

LOCAL_LDLIBS := -lpthread -ldl

LOCAL_MODULE:= libEGL

LOCAL_LDFLAGS += -Wl,--exclude-libs=ALL

LOCAL_SHARED_LIBRARIES += libdl



# Bionic's private TLS header relies on the ARCH_ARM_HAVE_TLS_REGISTER to

# select the appropriate TLS codepath

ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
@@ -39,13 +39,6 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES 
LOCAL_CFLAGS += -fvisibility=hidden

LOCAL_CFLAGS += -DEGL_TRACE=1



ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

  LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif

ifeq ($(TARGET_HAVE_TEGRA_ERRATA_657451),true)

  LOCAL_CFLAGS += -DHAVE_TEGRA_ERRATA_657451

endif



ifneq ($(MAX_EGL_CACHE_ENTRY_SIZE),)

  LOCAL_CFLAGS += -DMAX_EGL_CACHE_ENTRY_SIZE=$(MAX_EGL_CACHE_ENTRY_SIZE)

endif
@@ -79,9 +72,7 @@ endif 


include $(CLEAR_VARS)



LOCAL_SRC_FILES:= 		\

	GLES_CM/gl.cpp.arm 	\

#

LOCAL_SRC_FILES := GLES_CM/gl.cpp.arm



LOCAL_SHARED_LIBRARIES += libcutils libEGL

LOCAL_LDLIBS := -lpthread -ldl
@@ -101,13 +92,6 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv1\" 
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES

LOCAL_CFLAGS += -fvisibility=hidden



ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

  LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif

ifeq ($(TARGET_HAVE_TEGRA_ERRATA_657451),true)

  LOCAL_CFLAGS += -DHAVE_TEGRA_ERRATA_657451

endif



include $(BUILD_SHARED_LIBRARY)
@@ -117,9 +101,7 @@ include $(BUILD_SHARED_LIBRARY) 


include $(CLEAR_VARS)



LOCAL_SRC_FILES:= 		\

	GLES2/gl2.cpp.arm 	\

#

LOCAL_SRC_FILES := GLES2/gl2.cpp.arm



LOCAL_SHARED_LIBRARIES += libcutils libEGL

LOCAL_LDLIBS := -lpthread -ldl
@@ -139,13 +121,6 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv2\" 
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES

LOCAL_CFLAGS += -fvisibility=hidden



ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

  LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif

ifeq ($(TARGET_HAVE_TEGRA_ERRATA_657451),true)

  LOCAL_CFLAGS += -DHAVE_TEGRA_ERRATA_657451

endif



include $(BUILD_SHARED_LIBRARY)



###############################################################################
@@ -154,9 +129,7 @@ include $(BUILD_SHARED_LIBRARY) 


include $(CLEAR_VARS)



LOCAL_SRC_FILES:= 		\

	ETC1/etc1.cpp 	\

#

LOCAL_SRC_FILES := ETC1/etc1.cpp



LOCAL_LDLIBS := -lpthread -ldl

LOCAL_MODULE:= libETC1
@@ -169,9 +142,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) 


include $(CLEAR_VARS)



LOCAL_SRC_FILES:= 		\

	ETC1/etc1.cpp 	\

#

LOCAL_SRC_FILES := ETC1/etc1.cpp



LOCAL_LDLIBS := -lpthread -ldl

LOCAL_MODULE:= libETC1