commit 504ee5ccaabd8bce4da3430b0f4e9714ac2a8e6c
author Narayan Kamath <narayan@google.com> Mon Mar 03 11:20:36 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 03 11:20:36 2014 +0000
tree 7926a7f51fc12edec77fb7c04594eda8c2d949ce
parent 8145346664b83fbeaa6a5f9d48230de4ad50adf1
parent 85ecdac13cf9290e23eae013cd8551ff15d88387

Merge "external/neven shouldn't depend on android_runtime."

Android.mk

diff --git a/Android.mk b/Android.mk
index 52e6b14..e537384 100644
--- a/Android.mk
+++ b/Android.mk
@@ -115,7 +115,6 @@
 	$(LOCAL_PATH)/unix/src
 
 LOCAL_SHARED_LIBRARIES := \
-	libandroid_runtime \
 	libnativehelper \
 	libutils \
 	liblog \

FaceDetector_jni.cpp

diff --git a/FaceDetector_jni.cpp b/FaceDetector_jni.cpp
index 414b117..ca2786a 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 @@
 
 int register_android_media_FaceDetector(JNIEnv *_env)
 {
-    return android::AndroidRuntime::registerNativeMethods(
-            _env, classPathName, methods, NELEM(methods));
+    return jniRegisterNativeMethods(_env, classPathName, methods, NELEM(methods));
 }
 
 // ---------------------------------------------------------------------------