Convert tests to Android.bp
Test: make
adb shell stop; adb sync; adb shell start
- wait for device to finish
adb shell /data/nativetest/angeles/angeles
adb shell /data/nativetest/test-opengl-configdump/test-opengl-configdump
adb shell /data/nativetest/EGL_test/EGL_test
adb shell /data/nativetest/test-opengl-fillrate/test-opengl-fillrate
adb shell /data/nativetest/test-opengl-filter/test-opengl-filter 3
adb shell /data/nativetest/test-opengl-filter/test-opengl-filter 3 pbuffer
adb shell /data/nativetest/test-opengl-finish/test-opengl-finish
adb shell /data/nativetest/test-opengl-gl2_basic/test-opengl-gl2_basic
adb shell /data/nativetest/test-opengl-gl2_copyTexImage/test-opengl-gl2_copyTexImage
adb shell /data/nativetest/test-opengl-gl2_yuvtex/test-opengl-gl2_yuvtex
adb shell /data/nativetest/test-opengl-gl_basic/test-opengl-gl_basic
adb shell /data/nativetest/test-opengl-gl2_perf/test-opengl-gl2_perf
adb shell /data/nativetest/test-opengl-gl_yuvtex/test-opengl-gl_yuvtex
adb shell /data/nativetest/test-opengl-gralloc/test-opengl-gralloc
Bug: 37512442
Change-Id: I5d7b974333f485570304728d0572e251bb576f7e
Merged-In: I5d7b974333f485570304728d0572e251bb576f7e
(cherry picked from commit 03d9f07200796e5c436e28325b6b120e3c14c6e9)
diff --git a/opengl/tests/gl_perf/Android.bp b/opengl/tests/gl_perf/Android.bp
new file mode 100644
index 0000000..0ffb121
--- /dev/null
+++ b/opengl/tests/gl_perf/Android.bp
@@ -0,0 +1,24 @@
+cc_test {
+ name: "test-opengl-gl2_perf",
+
+ srcs: [
+ "gl2_perf.cpp",
+ "filltest.cpp",
+ ],
+
+ gtest: false,
+
+ shared_libs: [
+ "libcutils",
+ "liblog",
+ "libEGL",
+ "libGLESv2",
+ "libui",
+ "libgui",
+ "libutils",
+ ],
+
+ static_libs: ["libglTest"],
+
+ cflags: ["-DGL_GLEXT_PROTOTYPES"],
+}
diff --git a/opengl/tests/gl_perf/Android.mk b/opengl/tests/gl_perf/Android.mk
deleted file mode 100644
index 9a93fab..0000000
--- a/opengl/tests/gl_perf/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- gl2_perf.cpp \
- filltest.cpp
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- liblog \
- libEGL \
- libGLESv2 \
- libui \
- libgui \
- libutils
-
-LOCAL_STATIC_LIBRARIES += libglTest
-
-LOCAL_C_INCLUDES += $(call include-path-for, opengl-tests-includes)
-
-LOCAL_MODULE:= test-opengl-gl2_perf
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES
-
-include $(BUILD_EXECUTABLE)