[PATCH v3 1/3] build: Add skeleton for BlueZ Android
From: Frederic Danis <hidden>
Date: 2013-09-24 16:11:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
--- Makefile.am | 4 +++- Makefile.android | 4 ++++ android/Android.mk | 5 +++++ bootstrap-configure | 3 ++- configure.ac | 4 ++++ 5 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 Makefile.android create mode 100644 android/Android.mk
diff --git a/Makefile.am b/Makefile.am
index 4e4b1c5..51204f4 100644
--- a/Makefile.am
+++ b/Makefile.am@@ -179,6 +179,7 @@ test_scripts = include Makefile.tools include Makefile.obexd +include Makefile.android if HID2HCI rulesdir = @UDEV_DIR@/rules.d
@@ -293,7 +294,8 @@ pkgconfig_DATA = lib/bluez.pc endif DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --enable-library \ - --disable-systemd --disable-udev + --disable-systemd --disable-udev \ + --enable-android DISTCLEANFILES = $(pkgconfig_DATA)
diff --git a/Makefile.android b/Makefile.android
new file mode 100644
index 0000000..5e43730
--- /dev/null
+++ b/Makefile.android@@ -0,0 +1,4 @@ + +if ANDROID +EXTRA_DIST += android/Android.mk +endif
diff --git a/android/Android.mk b/android/Android.mk
new file mode 100644
index 0000000..31e2c1e
--- /dev/null
+++ b/android/Android.mk@@ -0,0 +1,5 @@ +LOCAL_PATH := $(call my-dir) + +# Retrieve BlueZ version from configure.ac file +BLUEZ_VERSION := $(shell grep ^AC_INIT $(LOCAL_PATH)/../configure.ac | cpp -P -D'AC_INIT(_,v)=v') +
diff --git a/bootstrap-configure b/bootstrap-configure
index 7a6e7d1..8bde920 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure@@ -12,4 +12,5 @@ fi --sysconfdir=/etc \ --localstatedir=/var \ --enable-experimental \ - --disable-datafiles $* + --disable-datafiles \ + --enable-android $*
diff --git a/configure.ac b/configure.ac
index 41c2935..22ab240 100644
--- a/configure.ac
+++ b/configure.ac@@ -242,4 +242,8 @@ AC_DEFINE_UNQUOTED(CONFIGDIR, "${configdir}", [Directory for the configuration files]) AC_SUBST(CONFIGDIR, "${configdir}") +AC_ARG_ENABLE(android, AC_HELP_STRING([--enable-android], + [enable BlueZ Android]), [android=${enableval}]) +AM_CONDITIONAL(ANDROID, test "${android}" = "yes") + AC_OUTPUT(Makefile src/bluetoothd.8 lib/bluez.pc)
--
1.7.9.5