From 30c2d17dba179c9e946f32870e21f4d7883f5ee7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Wed, 16 Sep 2015 07:50:19 -0400 Subject: [PATCH] src/android: do not link with libpng MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- src/platform/android.nit | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/platform/android.nit b/src/platform/android.nit index f1d1476..20e1f3a 100644 --- a/src/platform/android.nit +++ b/src/platform/android.nit @@ -170,7 +170,7 @@ LOCAL_MODULE := main LOCAL_SRC_FILES := \\ {{{cfiles.join(" \\\n")}}} LOCAL_LDLIBS := {{{ldflags.join(" ")}}} $(TARGET_ARCH)/libgc.a -LOCAL_STATIC_LIBRARIES := android_native_app_glue png +LOCAL_STATIC_LIBRARIES := android_native_app_glue include $(BUILD_SHARED_LIBRARY) @@ -236,10 +236,6 @@ $(call import-module,android/native_app_glue) exit 1 end share_dir = share_dir.realpath - var target_png_dir = "{android_project_root}/jni/png" - if not target_png_dir.file_exists then - toolcontext.exec_and_check(["ln", "-s", "{share_dir}/png/", target_png_dir], "Android project error") - end # Ensure that android-setup-libgc.sh has been executed if not "{share_dir}/libgc/arm/lib".file_exists then -- 1.7.9.5