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

Commit 3646dfeb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I76cb1ea5,Ia7e02c34 

* changes:
  Fix link-type warning on GL2JNI
  Fix link-type warning on GLJNI
parents 605fea12 8b24923b

opengl/tests/gl2_jni/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 := libgl2jni



LOCAL_SDK_VERSION := current





include $(BUILD_SHARED_LIBRARY)

opengl/tests/gl2_jni/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>

opengl/tests/gl_jni/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -37,13 +37,14 @@ LOCAL_SRC_FILES:= \ 
  gl_code.cpp



LOCAL_SHARED_LIBRARIES := \

	libutils \

	liblog \

	libEGL \

	libGLESv1_CM



LOCAL_MODULE := libgljni



LOCAL_SDK_VERSION := current



LOCAL_ARM_MODE := arm

opengl/tests/gl_jni/jni/gl_code.cpp

+6 −1
Original line number Diff line number Diff line
@@ -2,7 +2,12 @@ 


#include <jni.h>

#define LOG_TAG "GLJNI 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 <GLES/gl.h>