Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94d4abbf authored by Inseob Kim's avatar Inseob Kim Committed by android-build-merger
Browse files

Merge "Fix link-type warning on GLPerf" into pi-dev 

am: 1ec25461

Change-Id: Id0147769c8aca1ad45c9453ccedd38bf257f98cf
parents 1991437e 1ec25461

opengl/tests/gl_perfapp/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -39,11 +39,12 @@ LOCAL_SRC_FILES:= \ 
  gl_code.cpp



LOCAL_SHARED_LIBRARIES := \

	libutils \

	liblog \

	libEGL \

	libGLESv2



LOCAL_SDK_VERSION := current



LOCAL_MODULE := libglperf

opengl/tests/gl_perfapp/jni/gl_code.cpp

+7 −2
Original line number Diff line number Diff line
@@ -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"