diff options
| author | 2018-03-09 03:19:31 +0000 | |
|---|---|---|
| committer | 2018-03-09 03:19:31 +0000 | |
| commit | 1ec25461a4683c03b6807bfbc474ea90d6dfc863 (patch) | |
| tree | 6f81c9abf56573bac0ad1f5c09032e12c6233bf9 | |
| parent | 51e6abd6103e3eae0071024f02b3a21f58cc3f41 (diff) | |
| parent | f4fd7b22141161f82619c62d56f6775aea622959 (diff) | |
Merge "Fix link-type warning on GLPerf" into pi-dev
| -rw-r--r-- | opengl/tests/gl_perfapp/Android.mk | 3 | ||||
| -rw-r--r-- | opengl/tests/gl_perfapp/jni/gl_code.cpp | 9 |
2 files changed, 9 insertions, 3 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" |