diff options
Diffstat (limited to 'opengl')
32 files changed, 239 insertions, 460 deletions
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk deleted file mode 100644 index 2f42ab63d1..0000000000 --- a/opengl/libs/Android.mk +++ /dev/null @@ -1 +0,0 @@ -LOCAL_PATH:= $(call my-dir) diff --git a/opengl/tests/Android.mk b/opengl/tests/Android.mk deleted file mode 100644 index 134854a8b7..0000000000 --- a/opengl/tests/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -dirs := \ - linetex \ - swapinterval \ - textures \ - tritex \ - -ifneq (,$(TARGET_BUILD_JAVA_SUPPORT_LEVEL)) -dirs += \ - gl2_cameraeye \ - gl2_java \ - gl2_jni \ - gldual \ - gl_jni \ - gl_perfapp \ - lighting1709 \ - testLatency \ - testPauseResume \ - testViewport \ - -endif # JAVA_SUPPORT - -ifeq (platform,$(TARGET_BUILD_JAVA_SUPPORT_LEVEL)) -dirs += \ - testFramerate - -endif # JAVA_SUPPORT platform - -include $(call all-named-subdir-makefiles, $(dirs)) diff --git a/opengl/tests/gl2_cameraeye/Android.bp b/opengl/tests/gl2_cameraeye/Android.bp new file mode 100644 index 0000000000..00e00dfc91 --- /dev/null +++ b/opengl/tests/gl2_cameraeye/Android.bp @@ -0,0 +1,6 @@ +android_app { + name: "GL2CameraEye", + // Only compile source java files in this apk. + srcs: ["src/**/*.java"], + sdk_version: "current", +} diff --git a/opengl/tests/gl2_cameraeye/Android.mk b/opengl/tests/gl2_cameraeye/Android.mk deleted file mode 100644 index 4a43a9e2ff..0000000000 --- a/opengl/tests/gl2_cameraeye/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -# Only compile source java files in this apk. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := GL2CameraEye - -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) - -# Use the following include to make our test apk. -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/opengl/tests/gl2_java/Android.bp b/opengl/tests/gl2_java/Android.bp new file mode 100644 index 0000000000..a8e5d7d70b --- /dev/null +++ b/opengl/tests/gl2_java/Android.bp @@ -0,0 +1,8 @@ +//######################################################################## +// OpenGL ES 2.0 Java sample +//######################################################################## +android_app { + name: "GL2Java", + srcs: ["**/*.java"], + sdk_version: "current", +} diff --git a/opengl/tests/gl2_java/Android.mk b/opengl/tests/gl2_java/Android.mk deleted file mode 100644 index 71aa5a05f1..0000000000 --- a/opengl/tests/gl2_java/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -######################################################################### -# OpenGL ES 2.0 Java sample -######################################################################### - -TOP_LOCAL_PATH:= $(call my-dir) - -# Build activity - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := GL2Java -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) diff --git a/opengl/tests/gl2_jni/Android.bp b/opengl/tests/gl2_jni/Android.bp new file mode 100644 index 0000000000..65f89b159e --- /dev/null +++ b/opengl/tests/gl2_jni/Android.bp @@ -0,0 +1,27 @@ +//######################################################################## +// OpenGL ES JNI sample +// This makefile builds both an activity and a shared library. +//######################################################################## + +android_app { + name: "GL2JNI", + srcs: ["**/*.java"], + sdk_version: "current", + jni_libs: ["libgl2jni"], +} + +// Build JNI Shared Library +cc_library_shared { + name: "libgl2jni", + cflags: [ + "-Werror", + "-Wno-error=unused-parameter", + ], + srcs: ["jni/gl_code.cpp"], + shared_libs: [ + "liblog", + "libEGL", + "libGLESv2", + ], + sdk_version: "current", +} diff --git a/opengl/tests/gl2_jni/Android.mk b/opengl/tests/gl2_jni/Android.mk deleted file mode 100644 index b0081c2244..0000000000 --- a/opengl/tests/gl2_jni/Android.mk +++ /dev/null @@ -1,49 +0,0 @@ -######################################################################### -# OpenGL ES JNI sample -# This makefile builds both an activity and a shared library. -######################################################################### -TOP_LOCAL_PATH:= $(call my-dir) - -# Build activity - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := GL2JNI -LOCAL_SDK_VERSION := current - -LOCAL_JNI_SHARED_LIBRARIES := libgl2jni - -include $(BUILD_PACKAGE) - -######################################################################### -# Build JNI Shared Library -######################################################################### - -LOCAL_PATH:= $(LOCAL_PATH)/jni - -include $(CLEAR_VARS) - -# Optional tag would mean it doesn't get installed by default -LOCAL_MODULE_TAGS := optional - -LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter - -LOCAL_SRC_FILES:= \ - gl_code.cpp - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libEGL \ - libGLESv2 - -LOCAL_MODULE := libgl2jni - -LOCAL_SDK_VERSION := current - - -include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/tests/gl_jni/Android.bp b/opengl/tests/gl_jni/Android.bp new file mode 100644 index 0000000000..5bec336dd1 --- /dev/null +++ b/opengl/tests/gl_jni/Android.bp @@ -0,0 +1,34 @@ +//######################################################################## +// OpenGL ES JNI sample +// This makefile builds both an activity and a shared library. +//######################################################################## +// Build activity + +android_app { + name: "GLJNI", + srcs: ["**/*.java"], + sdk_version: "current", + jni_libs: ["libgljni"], +} + +// Build JNI Shared Library + +cc_library_shared { + name: "libgljni", + cflags: [ + "-Werror", + "-Wno-error=unused-parameter", + ], + srcs: ["jni/gl_code.cpp"], + shared_libs: [ + "liblog", + "libEGL", + "libGLESv1_CM", + ], + sdk_version: "current", + arch: { + arm: { + instruction_set: "arm", + }, + }, +} diff --git a/opengl/tests/gl_jni/Android.mk b/opengl/tests/gl_jni/Android.mk deleted file mode 100644 index d64dfcf2bf..0000000000 --- a/opengl/tests/gl_jni/Android.mk +++ /dev/null @@ -1,52 +0,0 @@ -######################################################################### -# OpenGL ES JNI sample -# This makefile builds both an activity and a shared library. -######################################################################### -TOP_LOCAL_PATH:= $(call my-dir) - -# Build activity - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := GLJNI -LOCAL_SDK_VERSION := current - -LOCAL_JNI_SHARED_LIBRARIES := libgljni - -include $(BUILD_PACKAGE) - -######################################################################### -# Build JNI Shared Library -######################################################################### - -LOCAL_PATH:= $(LOCAL_PATH)/jni - -include $(CLEAR_VARS) - -# Optional tag would mean it doesn't get installed by default -LOCAL_MODULE_TAGS := optional - -LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter - -LOCAL_SRC_FILES:= \ - gl_code.cpp - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libEGL \ - libGLESv1_CM - -LOCAL_MODULE := libgljni - -LOCAL_SDK_VERSION := current - -LOCAL_ARM_MODE := arm - - - -include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/tests/gl_perfapp/Android.bp b/opengl/tests/gl_perfapp/Android.bp new file mode 100644 index 0000000000..cf899acfee --- /dev/null +++ b/opengl/tests/gl_perfapp/Android.bp @@ -0,0 +1,27 @@ +//######################################################################## +// OpenGL ES Perf App +// This makefile builds both an activity and a shared library. +//######################################################################## +android_app { + name: "GLPerf", + srcs: ["**/*.java"], + jni_libs: ["libglperf"], + // Run on Eclair + sdk_version: "7", +} + +// Build JNI Shared Library +cc_library_shared { + name: "libglperf", + cflags: [ + "-Werror", + "-Wno-error=unused-parameter", + ], + srcs: ["jni/gl_code.cpp"], + shared_libs: [ + "liblog", + "libEGL", + "libGLESv2", + ], + sdk_version: "current", +} diff --git a/opengl/tests/gl_perfapp/Android.mk b/opengl/tests/gl_perfapp/Android.mk deleted file mode 100644 index 3f411ea962..0000000000 --- a/opengl/tests/gl_perfapp/Android.mk +++ /dev/null @@ -1,52 +0,0 @@ -######################################################################### -# OpenGL ES Perf App -# This makefile builds both an activity and a shared library. -######################################################################### -TOP_LOCAL_PATH:= $(call my-dir) - -# Build activity - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := GLPerf - -LOCAL_JNI_SHARED_LIBRARIES := libglperf - -# Run on Eclair -LOCAL_SDK_VERSION := 7 - -include $(BUILD_PACKAGE) - -######################################################################### -# Build JNI Shared Library -######################################################################### - -LOCAL_PATH:= $(LOCAL_PATH)/jni - -include $(CLEAR_VARS) - -# Optional tag would mean it doesn't get installed by default -LOCAL_MODULE_TAGS := optional - -LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter - -LOCAL_SRC_FILES:= \ - gl_code.cpp - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libEGL \ - libGLESv2 - -LOCAL_SDK_VERSION := current - -LOCAL_MODULE := libglperf - - - -include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/tests/gldual/Android.bp b/opengl/tests/gldual/Android.bp new file mode 100644 index 0000000000..24325666e6 --- /dev/null +++ b/opengl/tests/gldual/Android.bp @@ -0,0 +1,30 @@ +//######################################################################## +// OpenGL ES JNI sample +// This makefile builds both an activity and a shared library. +//######################################################################## +// Build activity + +android_app { + name: "GLDual", + srcs: ["**/*.java"], + sdk_version: "current", + jni_libs: ["libgldualjni"], +} + +//######################################################################## +// Build JNI Shared Library +//######################################################################## +cc_library_shared { + name: "libgldualjni", + cflags: [ + "-Werror", + "-Wno-error=unused-parameter", + ], + srcs: ["jni/gl_code.cpp"], + shared_libs: [ + "liblog", + "libEGL", + "libGLESv2", + ], + sdk_version: "current", +} diff --git a/opengl/tests/gldual/Android.mk b/opengl/tests/gldual/Android.mk deleted file mode 100644 index 5bdc0a8f3f..0000000000 --- a/opengl/tests/gldual/Android.mk +++ /dev/null @@ -1,49 +0,0 @@ -######################################################################### -# OpenGL ES JNI sample -# This makefile builds both an activity and a shared library. -######################################################################### -TOP_LOCAL_PATH:= $(call my-dir) - -# Build activity - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := GLDual -LOCAL_SDK_VERSION := current - -LOCAL_JNI_SHARED_LIBRARIES := libgldualjni - -include $(BUILD_PACKAGE) - -######################################################################### -# Build JNI Shared Library -######################################################################### - -LOCAL_PATH:= $(LOCAL_PATH)/jni - -include $(CLEAR_VARS) - -# Optional tag would mean it doesn't get installed by default -LOCAL_MODULE_TAGS := optional - -LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter - -LOCAL_SRC_FILES:= \ - gl_code.cpp - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libEGL \ - libGLESv2 - -LOCAL_MODULE := libgldualjni - -LOCAL_SDK_VERSION := current - - -include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/tests/lighting1709/Android.bp b/opengl/tests/lighting1709/Android.bp new file mode 100644 index 0000000000..e734dd1d2c --- /dev/null +++ b/opengl/tests/lighting1709/Android.bp @@ -0,0 +1,6 @@ +android_test { + name: "LightingTest", + srcs: ["**/*.java"], + sdk_version: "current", + certificate: "platform", +} diff --git a/opengl/tests/lighting1709/Android.mk b/opengl/tests/lighting1709/Android.mk deleted file mode 100644 index 004723176e..0000000000 --- a/opengl/tests/lighting1709/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := LightingTest -LOCAL_SDK_VERSION := current -LOCAL_CERTIFICATE := platform - -include $(BUILD_PACKAGE) diff --git a/opengl/tests/linetex/Android.bp b/opengl/tests/linetex/Android.bp new file mode 100644 index 0000000000..dbc2cdbd44 --- /dev/null +++ b/opengl/tests/linetex/Android.bp @@ -0,0 +1,17 @@ +cc_binary { + name: "test-opengl-linetex", + srcs: ["linetex.cpp"], + cflags: [ + "-Wall", + "-Werror", + ], + shared_libs: [ + "libcutils", + "libEGL", + "libGLESv1_CM", + "libui", + "libgui", + "libutils", + ], + static_libs: ["libglTest"], +} diff --git a/opengl/tests/linetex/Android.mk b/opengl/tests/linetex/Android.mk deleted file mode 100644 index 3df0a0fef7..0000000000 --- a/opengl/tests/linetex/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - linetex.cpp - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libEGL \ - libGLESv1_CM \ - libui \ - libgui \ - libutils - -LOCAL_STATIC_LIBRARIES += libglTest - -LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) - -LOCAL_MODULE:= test-opengl-linetex - -LOCAL_MODULE_TAGS := optional - -include $(BUILD_EXECUTABLE) diff --git a/opengl/tests/swapinterval/Android.bp b/opengl/tests/swapinterval/Android.bp new file mode 100644 index 0000000000..eed4dff3a5 --- /dev/null +++ b/opengl/tests/swapinterval/Android.bp @@ -0,0 +1,17 @@ +cc_binary { + name: "test-opengl-swapinterval", + srcs: ["swapinterval.cpp"], + cflags: [ + "-Wall", + "-Werror", + ], + shared_libs: [ + "libcutils", + "libutils", + "libEGL", + "libGLESv1_CM", + "libui", + "libgui", + ], + static_libs: ["libglTest"], +} diff --git a/opengl/tests/swapinterval/Android.mk b/opengl/tests/swapinterval/Android.mk deleted file mode 100644 index 2a2c12f17a..0000000000 --- a/opengl/tests/swapinterval/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - swapinterval.cpp - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libutils \ - libEGL \ - libGLESv1_CM \ - libui \ - libgui - -LOCAL_STATIC_LIBRARIES += libglTest - -LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) - -LOCAL_MODULE:= test-opengl-swapinterval - -LOCAL_MODULE_TAGS := optional - -include $(BUILD_EXECUTABLE) diff --git a/opengl/tests/testFramerate/Android.bp b/opengl/tests/testFramerate/Android.bp new file mode 100644 index 0000000000..5aa83b0753 --- /dev/null +++ b/opengl/tests/testFramerate/Android.bp @@ -0,0 +1,9 @@ +//######################################################################## +// Test framerate and look for hiccups +//######################################################################## + +android_app { + name: "TestFramerate", + srcs: ["**/*.java"], + sdk_version: "system_current", +} diff --git a/opengl/tests/testFramerate/Android.mk b/opengl/tests/testFramerate/Android.mk deleted file mode 100644 index ca6654a9db..0000000000 --- a/opengl/tests/testFramerate/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -######################################################################### -# Test framerate and look for hiccups -######################################################################### - -TOP_LOCAL_PATH:= $(call my-dir) - -# Build activity - - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := TestFramerate -LOCAL_SDK_VERSION := system_current - -include $(BUILD_PACKAGE) diff --git a/opengl/tests/testLatency/Android.bp b/opengl/tests/testLatency/Android.bp new file mode 100644 index 0000000000..c516dc3d17 --- /dev/null +++ b/opengl/tests/testLatency/Android.bp @@ -0,0 +1,8 @@ +//######################################################################## +// Test end-to-end latency. +//######################################################################## +android_app { + name: "TestLatency", + sdk_version: "8", + srcs: ["**/*.java"], +} diff --git a/opengl/tests/testLatency/Android.mk b/opengl/tests/testLatency/Android.mk deleted file mode 100644 index 96417c7ef5..0000000000 --- a/opengl/tests/testLatency/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -######################################################################### -# Test end-to-end latency. -######################################################################### - -TOP_LOCAL_PATH:= $(call my-dir) - -# Build activity - - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SDK_VERSION := 8 -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := TestLatency - -include $(BUILD_PACKAGE) diff --git a/opengl/tests/testPauseResume/Android.bp b/opengl/tests/testPauseResume/Android.bp new file mode 100644 index 0000000000..810e895ce2 --- /dev/null +++ b/opengl/tests/testPauseResume/Android.bp @@ -0,0 +1,6 @@ +// OpenGL ES JNI sample +android_app { + name: "TestEGL", + srcs: ["**/*.java"], + sdk_version: "current", +} diff --git a/opengl/tests/testPauseResume/Android.mk b/opengl/tests/testPauseResume/Android.mk deleted file mode 100644 index dda5424360..0000000000 --- a/opengl/tests/testPauseResume/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -######################################################################### -# OpenGL ES JNI sample -# This makefile builds both an activity and a shared library. -######################################################################### -TOP_LOCAL_PATH:= $(call my-dir) - -# Build activity - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := TestEGL -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) diff --git a/opengl/tests/testViewport/Android.bp b/opengl/tests/testViewport/Android.bp new file mode 100644 index 0000000000..629b573a2a --- /dev/null +++ b/opengl/tests/testViewport/Android.bp @@ -0,0 +1,9 @@ +//######################################################################## +// OpenGL ES JNI sample +// This makefile builds both an activity and a shared library. +//######################################################################## +android_app { + name: "TestViewport", + srcs: ["**/*.java"], + sdk_version: "8", +} diff --git a/opengl/tests/testViewport/Android.mk b/opengl/tests/testViewport/Android.mk deleted file mode 100644 index 9980e7dbc7..0000000000 --- a/opengl/tests/testViewport/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ -######################################################################### -# OpenGL ES JNI sample -# This makefile builds both an activity and a shared library. -######################################################################### -TOP_LOCAL_PATH:= $(call my-dir) - -# Build activity - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := TestViewport - -# Set a specific SDK version so we can run on Froyo. - -LOCAL_SDK_VERSION := 8 - -include $(BUILD_PACKAGE) diff --git a/opengl/tests/textures/Android.bp b/opengl/tests/textures/Android.bp new file mode 100644 index 0000000000..84adda2aa4 --- /dev/null +++ b/opengl/tests/textures/Android.bp @@ -0,0 +1,18 @@ +cc_binary { + name: "test-opengl-textures", + srcs: ["textures.cpp"], + shared_libs: [ + "libcutils", + "libEGL", + "libGLESv1_CM", + "libui", + "libgui", + "libutils", + ], + static_libs: ["libglTest"], + cflags: [ + "-DGL_GLEXT_PROTOTYPES", + "-Wall", + "-Werror", + ], +} diff --git a/opengl/tests/textures/Android.mk b/opengl/tests/textures/Android.mk deleted file mode 100644 index 629a2d2a78..0000000000 --- a/opengl/tests/textures/Android.mk +++ /dev/null @@ -1,26 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - textures.cpp - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libEGL \ - libGLESv1_CM \ - libui \ - libgui \ - libutils - -LOCAL_STATIC_LIBRARIES += libglTest - -LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) - -LOCAL_MODULE:= test-opengl-textures - -LOCAL_MODULE_TAGS := optional - -LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -LOCAL_CFLAGS += -Wall -Werror - -include $(BUILD_EXECUTABLE) diff --git a/opengl/tests/tritex/Android.bp b/opengl/tests/tritex/Android.bp new file mode 100644 index 0000000000..390397b9da --- /dev/null +++ b/opengl/tests/tritex/Android.bp @@ -0,0 +1,17 @@ +cc_binary { + name: "test-opengl-tritex", + srcs: ["tritex.cpp"], + cflags: [ + "-Wall", + "-Werror", + ], + shared_libs: [ + "libcutils", + "libEGL", + "libGLESv1_CM", + "libui", + "libgui", + "libutils", + ], + static_libs: ["libglTest"], +} diff --git a/opengl/tests/tritex/Android.mk b/opengl/tests/tritex/Android.mk deleted file mode 100644 index 7055afab55..0000000000 --- a/opengl/tests/tritex/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - tritex.cpp - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libEGL \ - libGLESv1_CM \ - libui \ - libgui \ - libutils - -LOCAL_STATIC_LIBRARIES += libglTest - -LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes) - -LOCAL_MODULE:= test-opengl-tritex - -LOCAL_MODULE_TAGS := optional - -include $(BUILD_EXECUTABLE) |