Build libbirdgems and libbirdxml for Android

Changed files (7)

• modified configure
• modified libbirdfont/BirdFont.vala
• added scripts/AndroidBirdFont.mk
• added scripts/AndroidBirdGems.mk
• added scripts/AndroidBirdXml.mk
• modified scripts/android_build.py
• modified scripts/build.py

Diff

diff --git a/configure b/configureindex c1aff84..075c109 100755--- a/configure+++ b/configure@@ -131,7 +131,8 @@ if not options.gee: 	options.gee = "Any" if not options.posix: 	options.posix = has_posixvala ()-	+ configure (options.gtk, options.gee, options.posix)+ configfile.write_config (options.prefix) configfile.write_compile_parameters (options.prefix, options.dest, options.cc, gee, options.posix)	diff --git a/libbirdfont/BirdFont.vala b/libbirdfont/BirdFont.valaindex 40f849d..9d71c2d 100644--- a/libbirdfont/BirdFont.vala+++ b/libbirdfont/BirdFont.vala@@ -728,7 +728,11 @@ public static void printd (string s) {  /** Translate string */ public string t_ (string t) {+#if ANDROID+	return t;+#else  	return _(t);+#endif }  /** Translate mac menu items */diff --git a/scripts/AndroidBirdFont.mk b/scripts/AndroidBirdFont.mknew file mode 100644index 0000000..f501fa6--- /dev/null+++ b/scripts/AndroidBirdFont.mk@@ -0,0 +1,45 @@+LOCAL_PATH := $(call my-dir)++include $(CLEAR_VARS)++LOCAL_MODULE    := birdfont++LOCAL_CFLAGS    := -D 'GETTEXT_PACKAGE="birdfont"'+LOCAL_CFLAGS    += -Wno-missing-field-initializers +LOCAL_CFLAGS    += -I $(LOCAL_PATH)+LOCAL_CFLAGS    += -I ../../libbirdxml+LOCAL_CFLAGS    += -I ../../libbirdgems+LOCAL_CFLAGS    += -I /opt/android/include +LOCAL_CFLAGS    += -I /opt/android/include/glib-2.0+LOCAL_CFLAGS    += -I /opt/android/lib/glib-2.0/include+LOCAL_CFLAGS    += -I /opt/android/include/gee-1.0+LOCAL_CFLAGS    += -I /opt/android/include/freetype+LOCAL_CFLAGS    += -I /opt/android/include/cairo+++#FIXME: $(TARGET_ARCH_ABI)++LOCAL_LDLIBS	+= -L $(LOCAL_PATH)/../../+LOCAL_LDLIBS    += -lbirdxml+LOCAL_LDLIBS    += -lbirdgems++LOCAL_LDLIBS	+= -L/opt/android/lib+LOCAL_LDLIBS    += -ljava-bitmap +LOCAL_LDLIBS    += -lgee+LOCAL_LDLIBS    += -lft2+LOCAL_LDLIBS    += -lglib-2.0+LOCAL_LDLIBS    += -lgio-2.0+LOCAL_LDLIBS    += -lintl+LOCAL_LDLIBS    += -liconv+LOCAL_LDLIBS    += -lgobject-2.0++LOCAL_LDLIBS    += -lm+LOCAL_LDLIBS    += -lc+LOCAL_LDLIBS    += -lz+LOCAL_LDLIBS    += -llog++LOCAL_SRC_FILES := $(wildcard *.c) ++include $(BUILD_SHARED_LIBRARY)++$(call import-module,android/cpufeatures)diff --git a/scripts/AndroidBirdGems.mk b/scripts/AndroidBirdGems.mknew file mode 100644index 0000000..a13637d--- /dev/null+++ b/scripts/AndroidBirdGems.mk@@ -0,0 +1,29 @@+LOCAL_PATH := $(call my-dir)++include $(CLEAR_VARS)++LOCAL_MODULE    := birdgems++LOCAL_CFLAGS    += -Wno-missing-field-initializers +LOCAL_CFLAGS    += -I ../+LOCAL_CFLAGS    += -I /opt/android/include +LOCAL_CFLAGS    += -I /opt/android/include/glib-2.0+LOCAL_CFLAGS    += -I /opt/android/lib/glib-2.0/include++#FIXME: $(TARGET_ARCH_ABI)++LOCAL_LDLIBS	+= -L/opt/android/lib+LOCAL_LDLIBS    += -lglib-2.0+LOCAL_LDLIBS    += -lintl+LOCAL_LDLIBS    += -liconv+LOCAL_LDLIBS    += -lgobject-2.0++LOCAL_LDLIBS    += -lm+LOCAL_LDLIBS    += -lc+LOCAL_LDLIBS    += -llog++LOCAL_SRC_FILES := $(wildcard *.c) ++include $(BUILD_SHARED_LIBRARY)++$(call import-module,android/cpufeatures)diff --git a/scripts/AndroidBirdXml.mk b/scripts/AndroidBirdXml.mknew file mode 100644index 0000000..e9b927f--- /dev/null+++ b/scripts/AndroidBirdXml.mk@@ -0,0 +1,32 @@+LOCAL_PATH := $(call my-dir)++include $(CLEAR_VARS)++LOCAL_MODULE    := birdxml++LOCAL_CFLAGS    += -Wno-missing-field-initializers +LOCAL_CFLAGS    += -I ../+LOCAL_CFLAGS    += -I /opt/android/include +LOCAL_CFLAGS    += -I /opt/android/include/glib-2.0+LOCAL_CFLAGS    += -I /opt/android/lib/glib-2.0/include+LOCAL_CFLAGS    += -I /opt/android/include/gee-1.0+++#FIXME: $(TARGET_ARCH_ABI)++LOCAL_LDLIBS	+= -L/opt/android/lib+LOCAL_LDLIBS    += -lglib-2.0+LOCAL_LDLIBS    += -lintl+LOCAL_LDLIBS    += -liconv+LOCAL_LDLIBS    += -lgobject-2.0+LOCAL_LDLIBS    += -lgee++LOCAL_LDLIBS    += -lm+LOCAL_LDLIBS    += -lc+LOCAL_LDLIBS    += -llog++LOCAL_SRC_FILES := $(wildcard *.c) ++include $(BUILD_SHARED_LIBRARY)++$(call import-module,android/cpufeatures)diff --git a/scripts/android_build.py b/scripts/android_build.pyindex 3989d36..34f1428 100755--- a/scripts/android_build.py+++ b/scripts/android_build.py@@ -31,13 +31,26 @@ library = "libbirdfont.so"  configfile.write_config (prefix) compile_translations()+ build.libbirdgems(prefix, cc, cflags, library_ldflags, valac, valaflags, library)+run ("mkdir -p build/libbirdgems/jni");+run ("cp scripts/AndroidBirdGems.mk build/libbirdgems/jni/Android.mk");+run ("cp build/libbirdgems/*.c build/libbirdgems/jni/");+run ("cd build/libbirdgems/jni && ndk-build");+run ("cp -ra build/libbirdgems/libs/armeabi/libbirdgems.so build/");+ build.libbirdxml(prefix, cc, cflags, library_ldflags, valac, valaflags, library)+run ("mkdir -p build/libbirdxml/jni");+run ("cp scripts/AndroidBirdXml.mk build/libbirdxml/jni/Android.mk");+run ("cp build/libbirdxml/*.c build/libbirdxml/jni/");+run ("cd build/libbirdxml/jni && ndk-build");+run ("cp -ra build/libbirdxml/libs/armeabi/libbirdxml.so build/");+ build.libbirdfont(prefix, cc, cflags, library_ldflags, valac, valaflags, library)-run ("mkdir -p build/jni");-run ("cp scripts/Android.mk build/jni/");-run ("cp scripts/Application.mk build/jni");-run ("cp build/libbirdfont/*.c build/jni/");-run ("cd build/jni && ndk-build");+run ("mkdir -p build/libbirdfont/jni");+run ("cp scripts/AndroidBirdFont.mk build/libbirdfont/jni/Android.mk");+run ("cp build/libbirdfont/*.c build/libbirdfont/jni/");+run ("cd build/libbirdfont/jni && ndk-build");+run ("cp -ra build/libbirdfont/libs/armeabi/libbirdfont.so build/");  print ("Done")diff --git a/scripts/build.py b/scripts/build.pyindex 1af31da..6e17d7e 100644--- a/scripts/build.py+++ b/scripts/build.py@@ -188,13 +188,13 @@ def libbirdgems(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull  		--library libbirdgems \ 		libbirdgems/*.vala \ 		""")++	run("cp libbirdgems/*.c build/libbirdgems/")+	run("cp libbirdgems/*.h build/libbirdgems/") 	 	if cc == "": 		print ("Skipping compilation");-	else:-		run("cp libbirdgems/*.c build/libbirdgems/")-		run("cp libbirdgems/*.h build/libbirdgems/")-			+	else:	 		run(cc + " " + cflags + """ \ 			-fPIC \ 			$(pkg-config --cflags glib-2.0) \