summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.mk9
1 files changed, 3 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index ba92c77..aad662c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,8 +8,7 @@ LIBXKBCOMMON_BUILT_MAKEFILES := \
LIBXKBCOMMON_CONFIGURE_TARGET := $(LIBXKBCOMMON_TOP)/Makefile
-$(LIBXKBCOMMON_CONFIGURE_TARGET): $(CONFIGURE_DEPENDENCIES) \
- $(CONTRIB_ROOT)/xproto/X11/Makefile
+$(LIBXKBCOMMON_CONFIGURE_TARGET): $(CONFIGURE_DEPENDENCIES)
cd $(LIBXKBCOMMON_TOP) && autoreconf -fiv
cd $(LIBXKBCOMMON_TOP) && \
CC="$(CONFIGURE_CC)" \
@@ -17,11 +16,9 @@ $(LIBXKBCOMMON_CONFIGURE_TARGET): $(CONFIGURE_DEPENDENCIES) \
LD=$(TARGET_LD) \
LDFLAGS="$(CONFIGURE_LDFLAGS)" \
CPP=$(CONFIGURE_CPP) \
- CPPFLAGS="$(CONFIGURE_CPPFLAGS) -I$(CONTRIB_ROOT)/kbproto -I$(CONTRIB_ROOT)/xproto" \
+ CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) \
PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \
- X11_CFLAGS="-I$(CONTRIB_ROOT)/kbproto -I$(CONTRIB_ROOT)/xproto" \
- X11_LIBS=" " \
./configure --host=arm-linux-androideabi \
--prefix /system \
--with-xkb-config-root=/system/usr/share/xkb
@@ -48,5 +45,5 @@ contrib-clean: libxkbcommon-clean
CONFIGURE_PKG_CONFIG_LIBDIR := $(CONFIGURE_PKG_CONFIG_LIBDIR):$(abspath $(LIBXKBCOMMON_TOP))
--include $(LIBXKBCOMMON_BUILT_MAKEFILES)
+include $(LIBXKBCOMMON_BUILT_MAKEFILES)