Fix link-type warning on GLPerf
An sdk app GLPerf uses a native:platform library libglperf, which
causes a link-type warning. Actually libutils is the only platform
library used by libglperf, and the warning can be eliminated by
rewriting code not to use libutils and setting LOCAL_SDK_VERSION.
Bug: 73907534
Test: mma -j does not show any link-type warnings
Merged-In: I9ad9b542288e6dd914f14ec45d8d35c6985da89f
Change-Id: I9ad9b542288e6dd914f14ec45d8d35c6985da89f
diff --git a/opengl/tests/gl_perfapp/Android.mk b/opengl/tests/gl_perfapp/Android.mk
index 854b54f..3f411ea 100644
--- a/opengl/tests/gl_perfapp/Android.mk
+++ b/opengl/tests/gl_perfapp/Android.mk
@@ -39,11 +39,12 @@
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 0cb594a..bd1fd83 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"
