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

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

Merge changes I9ad9b542,I2a4f4bb0 

am: 58c78ab2

Change-Id: I085f1a483319ee37942e8f11548855206cd44eea
parents 25c85d55 58c78ab2

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"

opengl/tests/gldual/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

opengl/tests/gldual/jni/gl_code.cpp

+6 −1
Original line number Diff line number Diff line
@@ -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>