partially restored compilability for the newest NDK version

#3
eugals · Apr 3, 2018 · a5207e0 · a5207e0
1 parent 5879aa3
commit a5207e0
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.3'
+    compileSdkVersion 26
+    buildToolsVersion '26.1.1'
 
     defaultConfig {
         applicationId "org.p2lang.gtkandroid"

diff --git a/app/jni/Application.mk b/app/jni/Application.mk
@@ -1,2 +1,2 @@
-APP_ABI := armeabi
+APP_ABI := armeabi-v7a
 APP_PLATFORM := android-15
diff --git a/clibs/cairo/Android.mk b/clibs/cairo/Android.mk
@@ -47,11 +47,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE    := cairo
 LOCAL_CFLAGS    := -O2 $(LIBCAIRO_CFLAGS) -I$(PIXMAN_SOURCES_PATH)/pixman \
                    -I$(CAIRO_SOURCES_PATH)/src -I$(MAKEFILE_PATH)/cairo-extra \
-                   -I$(MAKEFILE_PATH)/pixman-extra -Wno-missing-field-initializers
-
-# remove the following line once NDK updates it's GCC to a version
-# with this fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56982
-LOCAL_CFLAGS    += -fno-tree-dominator-opts
+                   -I$(MAKEFILE_PATH)/pixman-extra -Wno-missing-field-initializers -Wno-enum-conversion
 
 LOCAL_SRC_FILES := cairo/util/cairo-gobject/cairo-gobject-enums.c \
                    cairo/util/cairo-gobject/cairo-gobject-structs.c \

diff --git a/clibs/fontconfig/config.h b/clibs/fontconfig/config.h
@@ -349,7 +349,7 @@
 /* #undef inline */
 #endif
 
-#include <machine/endian.h>
+//#include <machine/endian.h>
 #ifdef __LP64__
 #   define SIZEOF_VOID_P 8
 #   define ALIGNOF_DOUBLE 8

diff --git a/clibs/gio/include/gio/gnetworking.h b/clibs/gio/include/gio/gnetworking.h
@@ -19,6 +19,9 @@
 #ifndef __G_NETWORKING_H__
 #define __G_NETWORKING_H__
 
+// don't let this header be included because glib/distsrc/gio/gthreadedresolver.c has a copy of that thing
+#define _ARPA_NAMESER_H_
+
 #include <glib.h>
 
 #ifdef G_OS_WIN32
@@ -46,8 +49,8 @@
 #include <sys/un.h>
 #include <net/if.h>
 
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
+//#include <arpa/inet.h>
+//#include <arpa/nameser.h>
 //#include <arpa/nameser_compat.h>
 
 #ifndef T_SRV

diff --git a/clibs/glib/include/libintl.h b/clibs/glib/include/libintl.h
@@ -0,0 +1 @@
+// dummy header to pacify ../distsrc/glib/gi18n-lib.h compilation
diff --git a/clibs/gtk/gtkainit.c b/clibs/gtk/gtkainit.c
@@ -88,7 +88,7 @@ static void adjust_default_font()
     }
 }
 
-static gtk_window_tweak_class()
+static void gtk_window_tweak_class()
 {
     GObjectClass *objClass = G_OBJECT_CLASS(g_type_class_ref(GTK_TYPE_WINDOW));
 
@@ -117,8 +117,6 @@ static void onActivityDestroy(ANativeActivity* activity)
 // instead of *gtk_init* which would be used on other platforms
 void gtk_android_init(struct android_app *state)
 {
-    app_dummy(); // Make sure glue isn't stripped.
-
     _gtk_android_glue_app = state;
 
     g_log_set_default_handler(log_handler, NULL);

diff --git a/clibs/gtk/gtkresources.mk b/clibs/gtk/gtkresources.mk
@@ -19,5 +19,5 @@ installed_modules: $(GTK_CSS_DST)
 $(call generate-file-dir,$(GTK_CSS_DST))
 
 $(GTK_CSS_DST): clean-installed-binaries
-    $(hide) $(call host-install,$(GTK_CSS_SRC),$(GTK_CSS_DST))
+	$(hide) $(call host-install,$(GTK_CSS_SRC),$(GTK_CSS_DST))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		// dummy header to pacify ../distsrc/glib/gi18n-lib.h compilation