Fix standalone build of native opengl tests
Change-Id: I48ac953b7b830581d16453cabd7d8ccbbdc301f0
diff --git a/tests/tests/nativeopengl/standalone/.gitignore b/tests/tests/nativeopengl/standalone/.gitignore
new file mode 100644
index 0000000..1d1cdd2
--- /dev/null
+++ b/tests/tests/nativeopengl/standalone/.gitignore
@@ -0,0 +1,8 @@
+bin/
+build.xml
+gen/
+libs/
+local.properties
+obj/
+proguard-project.txt
+project.properties
diff --git a/tests/tests/nativeopengl/standalone/AndroidManifest.xml b/tests/tests/nativeopengl/standalone/AndroidManifest.xml
index a82e42a..9092f69 100644
--- a/tests/tests/nativeopengl/standalone/AndroidManifest.xml
+++ b/tests/tests/nativeopengl/standalone/AndroidManifest.xml
@@ -20,7 +20,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.gltest"
android:versionCode="1"
- android:versionName="1.0" >
+ android:versionName="1.0"
+ android:debuggable="true" >
<uses-sdk
android:minSdkVersion="8"
@@ -28,7 +29,7 @@
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <application>
+ <application android:label="NativeGLTest">
<activity android:name=".GLTestActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/tests/tests/nativeopengl/standalone/jni/Android.mk b/tests/tests/nativeopengl/standalone/jni/Android.mk
index 06a1436..65e30d3 100644
--- a/tests/tests/nativeopengl/standalone/jni/Android.mk
+++ b/tests/tests/nativeopengl/standalone/jni/Android.mk
@@ -27,7 +27,7 @@
LOCAL_C_INCLUDES := $(MY_GTEST_PATH)/include
LOCAL_SRC_FILES := src/gtest-all.cc
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
# nativetests
@@ -37,13 +37,14 @@
LIB_PATH := $(LOCAL_PATH)/../libs/$(TARGET_ARCH_ABI)/
LOCAL_C_INCLUDES := $(MY_GTEST_PATH)/include
-LOCAL_LDLIBS := -L$(LIB_PATH) -landroid -lEGL -lGLESv2 -llog -lgtest
+LOCAL_LDLIBS := -L$(LIB_PATH) -landroid -lEGL -lGLESv2 -llog
+LOCAL_STATIC_LIBRARIES := libgtest
LOCAL_MODULE := nativeopengltests
LOCAL_SRC_FILES := GLTestHelper.cpp \
register.cpp \
tests/GLTest_test.cpp \
tests/EGLCleanup_test.cpp
-LOCAL_SHARE_LIBRARIES := libgtest
+LOCAL_SHARED_LIBRARIES := libgtest
include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/tests/nativeopengl/standalone/jni/tests/EGLCleanup_test.cpp b/tests/tests/nativeopengl/standalone/jni/tests/EGLCleanup_test.cpp
index b5bd830..1227d42 100644
--- a/tests/tests/nativeopengl/standalone/jni/tests/EGLCleanup_test.cpp
+++ b/tests/tests/nativeopengl/standalone/jni/tests/EGLCleanup_test.cpp
@@ -15,8 +15,7 @@
*/
#define LOG_TAG "EGLCleanup"
-#include <utils/Log.h>
-#include <utils/Thread.h>
+#include <android/log.h>
#include <jni.h>
#include <EGL/egl.h>
@@ -28,6 +27,10 @@
#include <pthread.h>
+#define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+#define ALOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
+#define ALOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
+#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
namespace android {
diff --git a/tests/tests/nativeopengl/standalone/src/com/android/gltest/GLTestActivity.java b/tests/tests/nativeopengl/standalone/src/com/android/gltest/GLTestActivity.java
index 3c1e2af..f0c250b 100644
--- a/tests/tests/nativeopengl/standalone/src/com/android/gltest/GLTestActivity.java
+++ b/tests/tests/nativeopengl/standalone/src/com/android/gltest/GLTestActivity.java
@@ -77,7 +77,6 @@
mSurfaceView.getHolder().addCallback(mHolderCallback);
setContentView(mSurfaceView);
System.loadLibrary("stlport_shared");
- System.loadLibrary("gtest");
System.loadLibrary("nativeopengltests");
}