fix android build

android/jni/Android.mk

@@ -14,11 +14,11 @@ LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/$(SOURCE_PATH)/src/ \
 	$(LOCAL_PATH)/$(SOURCE_PATH)/src/include/ \
 	$(LOCAL_PATH)/$(SOURCE_PATH)/src/gfx/ \
-	$(LOCAL_PATH)/$(SOURCE_PATH)/src/gfx/include/ \
 	$(LOCAL_PATH)/$(SOURCE_PATH)/src/simd/
 
 LOCAL_SRC_FILES := \
 	$(SOURCE_PATH)/src/core/curve.cpp \
+	$(SOURCE_PATH)/src/core/clipper.cpp \
 	$(SOURCE_PATH)/src/core/device.cpp \
 	$(SOURCE_PATH)/src/core/graphic_path.cpp \
 	$(SOURCE_PATH)/src/gfx/gfx_device.cpp \
@@ -36,7 +36,6 @@ LOCAL_SRC_FILES := \
 	$(SOURCE_PATH)/src/picasso_canvas.cpp \
 	$(SOURCE_PATH)/src/picasso_font_api.cpp \
 	$(SOURCE_PATH)/src/picasso_font.cpp \
-	$(SOURCE_PATH)/src/picasso_gpc.cpp \
 	$(SOURCE_PATH)/src/picasso_gradient_api.cpp \
 	$(SOURCE_PATH)/src/picasso_gradient.cpp \
 	$(SOURCE_PATH)/src/picasso_image.cpp \
@@ -58,7 +57,7 @@ LOCAL_CPPFLAGS := -DEXPORT=1 -DNDEBUG=1 -D__ANDROID__=1 \
 
 LOCAL_CFLAGS := $(LOCAL_CPPFLAGS)
 
-LOCAL_LDLIBS := \
+LOCAL_STATIC_LIBRARIES := \
 	$(LOCAL_PATH)/$(SOURCE_PATH)/android/freetype/obj/local/armeabi/libft2.a \
 	$(LOCAL_PATH)/$(SOURCE_PATH)/android/expat/obj/local/armeabi/libexpat.a
 
@@ -85,9 +84,10 @@ LOCAL_CFLAGS := $(LOCAL_CPPFLAGS)
 LOCAL_SRC_FILES := test_android.cpp \
         $(SOURCE_PATH)/test/alpha_func.c
 
+
 LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM
 
-LOCAL_STATIC_LIBRARIES := android_native_app_glue picasso
+LOCAL_STATIC_LIBRARIES := android_native_app_glue
 
 LOCAL_LDFLAGS := \
 	$(LOCAL_PATH)/$(SOURCE_PATH)/android/obj/local/armeabi/libpicasso.a \

android/jni/test_android.cpp

@@ -162,6 +162,19 @@ static void engine_handle_cmd(struct android_app* app, int32_t cmd)
 
 }
 
+static int __argc = 0;
+static const char** __argv = NULL;
+
+int argc(void)
+{
+    return __argc;
+}
+
+const char** argv(void)
+{
+    return __argv;
+}
+
 /**
  * This is the main entry point of a native application that is using
  * android_native_app_glue.  It runs in its own thread, with its own

autogen.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+touch ./INSTALL
+
 echo n | libtoolize --copy --force
 aclocal
 autoconf

build_android.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export NDK_ROOT=/d/android-ndk-r8b-windows/android-ndk-r8b
+export NDK_ROOT=/d/android-ndk-r10b
 
 export PROJECT_ROOT=`pwd`