diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-03 11:32:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-03 11:32:21 +0000 |
| commit | af6e0b0c0cb946a4222d7f5bacc7bea11c33d814 (patch) | |
| tree | afd1116d071c63924829e4ca5615d90fd7eaaf18 | |
| parent | a56610962abd49b99e04ca148d60f9dd28951fd9 (diff) | |
| parent | 504ee5ccaabd8bce4da3430b0f4e9714ac2a8e6c (diff) | |
| download | neven-af6e0b0c0cb946a4222d7f5bacc7bea11c33d814.tar.gz | |
am 504ee5cc: Merge "external/neven shouldn\'t depend on android_runtime."android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release
* commit '504ee5ccaabd8bce4da3430b0f4e9714ac2a8e6c':
external/neven shouldn't depend on android_runtime.
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | FaceDetector_jni.cpp | 5 |
2 files changed, 2 insertions, 4 deletions
@@ -114,7 +114,6 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/unix/src LOCAL_SHARED_LIBRARIES := \ - libandroid_runtime \ libnativehelper \ libutils \ liblog \ diff --git a/FaceDetector_jni.cpp b/FaceDetector_jni.cpp index 9a32ceb..3744c49 100644 --- a/FaceDetector_jni.cpp +++ b/FaceDetector_jni.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include <assert.h> #include <stdlib.h> #include <stdio.h> #include <fcntl.h> @@ -27,7 +28,6 @@ #include "jni.h" #include "JNIHelp.h" -#include "android_runtime/AndroidRuntime.h" using namespace android; @@ -288,8 +288,7 @@ static JNINativeMethod methods[] = { int register_android_media_FaceDetector(JNIEnv *_env) { - return android::AndroidRuntime::registerNativeMethods( - _env, classPathName, methods, NELEM(methods)); + return jniRegisterNativeMethods(_env, classPathName, methods, NELEM(methods)); } // --------------------------------------------------------------------------- |