Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1 am: 6a5e1a7f4a

Browse Source 
am: b8e43f60c2

Change-Id: I449cd9a5ceabb13abce3a5d345137025fca33579
This commit is contained in:
Dimitry Ivanov
2016-11-17 19:06:02 +00:00
committed by android-build-merger
parent ab8c119689 b8e43f60c2
commit c8ff9b50ed
2 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/tests/coretests/apks/install_jni_lib/Android.mk
View File

@@ -19,8 +19,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
com_android_frameworks_coretests_JNITest.cpp com_android_frameworks_coretests_JNITest.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SDK_VERSION := 16
libnativehelper
LOCAL_CFLAGS += -Wall -Werror LOCAL_CFLAGS += -Wall -Werror

24
core/tests/coretests/apks/install_jni_lib/com_android_frameworks_coretests_JNITest.cpp
View File

@@ -14,41 +14,23 @@
* limitations under the License. * limitations under the License.
*/ */
#include "nativehelper/JNIHelp.h" #include <jni.h>
namespace android { extern "C" JNIEXPORT
jint JNICALL Java_com_android_frameworks_coretests_JNITests_checkFunction(JNIEnv*, jclass) {
static jint checkFunction(JNIEnv*, jclass) {
return 1; 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 * JNI Initialization
*/ */
jint JNI_OnLoad(JavaVM *jvm, void */* reserved */) { jint JNI_OnLoad(JavaVM *jvm, void */* reserved */) {
JNIEnv *e; JNIEnv *e;
int status;
// Check JNI version // Check JNI version
if (jvm->GetEnv((void **) &e, JNI_VERSION_1_6)) { if (jvm->GetEnv((void **) &e, JNI_VERSION_1_6)) {
return JNI_ERR; return JNI_ERR;
} }
if ((status = android::register_com_android_frameworks_coretests_JNITests(e)) < 0) {
return JNI_ERR;
}
return JNI_VERSION_1_6; return JNI_VERSION_1_6;
} }