diff options
| -rw-r--r-- | opengl/tests/gl_perfapp/Android.mk | 3 | ||||
| -rw-r--r-- | opengl/tests/gl_perfapp/jni/gl_code.cpp | 9 | ||||
| -rw-r--r-- | opengl/tests/gldual/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/gldual/jni/gl_code.cpp | 7 |
4 files changed, 16 insertions, 5 deletions
diff --git a/opengl/tests/gl_perfapp/Android.mk b/opengl/tests/gl_perfapp/Android.mk index 854b54ff9e..3f411ea962 100644 --- a/opengl/tests/gl_perfapp/Android.mk +++ b/opengl/tests/gl_perfapp/Android.mk @@ -39,11 +39,12 @@ LOCAL_SRC_FILES:= \ gl_code.cpp LOCAL_SHARED_LIBRARIES := \ - libutils \ liblog \ libEGL \ libGLESv2 +LOCAL_SDK_VERSION := current + LOCAL_MODULE := libglperf diff --git a/opengl/tests/gl_perfapp/jni/gl_code.cpp b/opengl/tests/gl_perfapp/jni/gl_code.cpp index 0cb594a0b0..bd1fd83184 100644 --- a/opengl/tests/gl_perfapp/jni/gl_code.cpp +++ b/opengl/tests/gl_perfapp/jni/gl_code.cpp @@ -2,16 +2,21 @@ #include <jni.h> #define LOG_TAG "GLPerf gl_code.cpp" -#include <utils/Log.h> +#include <android/log.h> + +#define ALOG(priority, tag, ...) ((void)__android_log_print(ANDROID_##priority, tag, __VA_ARGS__)) + +#define ALOGI(...) ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__) +#define ALOGE(...) ALOG(LOG_ERROR, LOG_TAG, __VA_ARGS__) #include <EGL/egl.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> -#include <utils/Timers.h> #include <stdio.h> #include <stdlib.h> #include <math.h> +#include <time.h> #include "../../gl_perf/fill_common.cpp" diff --git a/opengl/tests/gldual/Android.mk b/opengl/tests/gldual/Android.mk index dc265b6e0d..5bdc0a8f3f 100644 --- a/opengl/tests/gldual/Android.mk +++ b/opengl/tests/gldual/Android.mk @@ -37,13 +37,13 @@ LOCAL_SRC_FILES:= \ gl_code.cpp LOCAL_SHARED_LIBRARIES := \ - libutils \ liblog \ libEGL \ libGLESv2 LOCAL_MODULE := libgldualjni +LOCAL_SDK_VERSION := current include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/tests/gldual/jni/gl_code.cpp b/opengl/tests/gldual/jni/gl_code.cpp index 90d150ba09..4e44976c92 100644 --- a/opengl/tests/gldual/jni/gl_code.cpp +++ b/opengl/tests/gldual/jni/gl_code.cpp @@ -2,7 +2,12 @@ #include <jni.h> #define LOG_TAG "GL2JNI gl_code.cpp" -#include <utils/Log.h> +#include <android/log.h> + +#define ALOG(priority, tag, ...) ((void)__android_log_print(ANDROID_##priority, tag, __VA_ARGS__)) + +#define ALOGI(...) ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__) +#define ALOGE(...) ALOG(LOG_ERROR, LOG_TAG, __VA_ARGS__) #include <EGL/egl.h> #include <GLES2/gl2.h> |