am 504ee5cc: Merge "external/neven shouldn\'t depend on android_runtime."
* commit '504ee5ccaabd8bce4da3430b0f4e9714ac2a8e6c':
external/neven shouldn't depend on android_runtime.
diff --git a/Android.mk b/Android.mk
index e537384..f0b1fa7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -108,7 +108,6 @@
LOCAL_C_INCLUDES += \
external/neven/FaceRecEm/common/src/b_FDSDK \
$(JNI_H_INCLUDE) \
- $(call include-path-for, corecg graphics) \
$(LOCAL_PATH)/FaceRecEm/common/src \
$(LOCAL_PATH)/Embedded/common/conf \
$(LOCAL_PATH)/Embedded/common/src \
diff --git a/FaceDetector_jni.cpp b/FaceDetector_jni.cpp
index ca2786a..3744c49 100644
--- a/FaceDetector_jni.cpp
+++ b/FaceDetector_jni.cpp
@@ -24,7 +24,7 @@
#include <utils/String8.h>
#include <utils/Log.h>
-#include <core/SkBitmap.h>
+#include <SkBitmap.h>
#include "jni.h"
#include "JNIHelp.h"