Fix includes so that they no longer rely on the global Skia includes directories.
bug:13225538
Change-Id: I3e424513a4d8a9cb648ba3ac13efac304590f826
diff --git a/Android.mk b/Android.mk
index 52e6b14..5a69fec 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 414b117..9a32ceb 100644
--- a/FaceDetector_jni.cpp
+++ b/FaceDetector_jni.cpp
@@ -23,7 +23,7 @@
#include <utils/String8.h>
#include <utils/Log.h>
-#include <core/SkBitmap.h>
+#include <SkBitmap.h>
#include "jni.h"
#include "JNIHelp.h"