android: add build files

squashed: android: set xkb config path

Conflicts:
	Makefile.am

diff --git a/Android.mk b/Android.mk
new file mode 100644 (file)
index 0000000..75b4c9d
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,45 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LIBXKBCOMMON_TOP := $(LOCAL_PATH)
+
+LIBXKBCOMMON_BUILT_MAKEFILES := \
+       $(LIBXKBCOMMON_TOP)/Android_build.mk
+
+libxkbcommon-configure:
+       cd $(LIBXKBCOMMON_TOP) && autoreconf -fiv
+       cd $(LIBXKBCOMMON_TOP) && \
+               CC="$(CONFIGURE_CC)" \
+               CFLAGS="$(CONFIGURE_CFLAGS)" \
+               LD=$(TARGET_LD) \
+               LDFLAGS="$(CONFIGURE_LDFLAGS)" \
+               CPP=$(CONFIGURE_CPP) \
+               CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
+               PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) \
+               PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \
+               ./configure --host=arm-linux-androideabi \
+               --prefix /system \
+               --with-xkb-config-root=/system/usr/share/xkb
+       rm -f $(LIBXKBCOMMON_BUILT_MAKEFILES)
+       @for file in $(LIBXKBCOMMON_BUILT_MAKEFILES); do \
+               echo "make -C $$(dirname $$file) $$(basename $$file)" ; \
+               make -C $$(dirname $$file) $$(basename $$file) ; \
+       done
+
+libxkbcommon-reset:
+       cd $(LIBXKBCOMMON_TOP) && \
+       git clean -qdxf && \
+       git reset --hard HEAD
+
+libxkbcommon-clean:
+
+.PHONY: libxkbcommon-configure libxkbcommon-clean libxkbcommon-reset
+
+CONFIGURE_TARGETS += libxkbcommon-configure
+CONFIGURE_RESET_TARGETS += libxkbcommon-reset
+AGGREGATE_CLEAN_TARGETS += libxkbcommon-clean
+CONFIGURE_PKG_CONFIG_LIBDIR := $(CONFIGURE_PKG_CONFIG_LIBDIR):$(LIBXKBCOMMON_TOP)
+
+-include $(LIBXKBCOMMON_BUILT_MAKEFILES)
+

diff --git a/Makefile.am b/Makefile.am
index 8d556b1..1235510 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,3 +151,19 @@ KEYSYMDEFS = \
         $(X11_INCLUDEDIR)/HPkeysym.h
 update-keysyms:
        sed -e '/XK_Ydiaeresis\s*0x100000ee/d; /#define _/d; s/#define\s*\(\w*\)XK_/#define XKB_KEY_\1/; /\(#ifdef\|#ifndef\|#endif\)/d' $(KEYSYMDEFS) > xkbcommon/xkbcommon-keysyms.h
+
+# Android stuff
+
+Android_build.mk: Makefile $(BUILT_SOURCES)
+       androgenizer \
+       -:PROJECT libxkbcommon \
+       -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+       \
+       -:STATIC libxkbcommon \
+       -:TAGS eng debug \
+       -:SOURCES $(filter-out %.l %.y,$(libxkbcommon_la_SOURCES)) $(BUILT_SOURCES) \
+       -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) \
+       -:LDFLAGS $(libxkbcommon_la_LDFLAGS) \
+       \
+       -:PASSTHROUGH 'libxkbcommon-clean: clean-libxkbcommon' \
+       > $@