Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1 am:... (fcb4024e) · Commits · e / os / android_frameworks_base

core/tests/coretests/apks/install_jni_lib/Android.mk

+1 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,7 @@ include $(CLEAR_VARS)
		LOCAL_SRC_FILES := \
		com_android_frameworks_coretests_JNITest.cpp

		LOCAL_SHARED_LIBRARIES := \
		libnativehelper
		LOCAL_SDK_VERSION := 16

		LOCAL_CFLAGS += -Wall -Werror

+3 −21

Original line number	Diff line number	Diff line
		@@ -14,41 +14,23 @@
		* limitations under the License.
		*/

		#include "nativehelper/JNIHelp.h"
		#include <jni.h>

		namespace android {

		static jint checkFunction(JNIEnv*, jclass) {
		extern "C" JNIEXPORT
		jint JNICALL Java_com_android_frameworks_coretests_JNITests_checkFunction(JNIEnv*, jclass) {
		return 1;
		}

		static const JNINativeMethod sMethods[] = {
		/* name, signature, funcPtr */
		{ "checkFunction", "()I", (void*) checkFunction },
		};

		int register_com_android_frameworks_coretests_JNITests(JNIEnv* env) {
		return jniRegisterNativeMethods(env, "com/android/frameworks/coretests/JNITests", sMethods,
		NELEM(sMethods));
		}

		}

		/*
		* JNI Initialization
		*/
		jint JNI_OnLoad(JavaVM jvm, void /* reserved */) {
		JNIEnv *e;
		int status;

		// Check JNI version
		if (jvm->GetEnv((void **) &e, JNI_VERSION_1_6)) {
		return JNI_ERR;
		}

		if ((status = android::register_com_android_frameworks_coretests_JNITests(e)) < 0) {
		return JNI_ERR;
		}

		return JNI_VERSION_1_6;
		}