From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v2 BlueZ 4/4] android: Add variable ROOT_PATH to Android.mk
Date: Wed, 23 Oct 2013 11:08:19 +0300 [thread overview]
Message-ID: <1382515699-30338-4-git-send-email-luiz.dentz@gmail.com> (raw)
In-Reply-To: <1382515699-30338-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This makes it simpler to include files from other parts of the code.
---
android/Android.mk | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/android/Android.mk b/android/Android.mk
index 4c87a9b..20064fe 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -1,7 +1,8 @@
LOCAL_PATH := $(call my-dir)
+ROOT_PATH := $(LOCAL_PATH)/..
# Retrieve BlueZ version from configure.ac file
-BLUEZ_VERSION := $(shell grep ^AC_INIT $(LOCAL_PATH)/../configure.ac | cpp -P -D'AC_INIT(_,v)=v')
+BLUEZ_VERSION := $(shell grep ^AC_INIT $(ROOT_PATH)/configure.ac | cpp -P -D'AC_INIT(_,v)=v')
# Specify pathmap for glib
pathmap_INCL += glib:external/bluetooth/glib
@@ -18,25 +19,25 @@ LOCAL_SRC_FILES := \
adapter.c adapter.h \
hid.c hid.h \
ipc.c ipc.h \
- $(LOCAL_PATH)/../src/sdp.h \
- $(LOCAL_PATH)/../src/shared/mgmt.c \
- $(LOCAL_PATH)/../src/shared/util.c \
- $(LOCAL_PATH)/../src/sdpd-database.c \
- $(LOCAL_PATH)/../src/sdpd-service.c \
- $(LOCAL_PATH)/../src/sdpd-request.c \
- $(LOCAL_PATH)/../src/sdpd-server.c \
- $(LOCAL_PATH)/../lib/sdp.c \
- $(LOCAL_PATH)/../lib/bluetooth.c \
- $(LOCAL_PATH)/../lib/hci.c \
+ $(ROOT_PATH)/src/sdp.h \
+ $(ROOT_PATH)/src/shared/mgmt.c \
+ $(ROOT_PATH)/src/shared/util.c \
+ $(ROOT_PATH)/src/sdpd-database.c \
+ $(ROOT_PATH)/src/sdpd-service.c \
+ $(ROOT_PATH)/src/sdpd-request.c \
+ $(ROOT_PATH)/src/sdpd-server.c \
+ $(ROOT_PATH)/lib/sdp.c \
+ $(ROOT_PATH)/lib/bluetooth.c \
+ $(ROOT_PATH)/lib/hci.c \
LOCAL_C_INCLUDES := \
$(call include-path-for, glib) \
$(call include-path-for, glib)/glib \
LOCAL_C_INCLUDES += \
- $(LOCAL_PATH)/../ \
- $(LOCAL_PATH)/../src \
- $(LOCAL_PATH)/../lib \
+ $(ROOT_PATH)/ \
+ $(ROOT_PATH)/src \
+ $(ROOT_PATH)/lib \
LOCAL_CFLAGS := -DVERSION=\"$(BLUEZ_VERSION)\"
@@ -51,9 +52,9 @@ lib_headers := \
sdp_lib.h \
sdp.h \
-$(shell mkdir -p $(LOCAL_PATH)/../lib/bluetooth)
+$(shell mkdir -p $(ROOT_PATH)/lib/bluetooth)
-$(foreach file,$(lib_headers), $(shell ln -sf ../$(file) $(LOCAL_PATH)/../lib/bluetooth/$(file)))
+$(foreach file,$(lib_headers), $(shell ln -sf ../$(file) $(ROOT_PATH)/lib/bluetooth/$(file)))
LOCAL_MODULE := bluetoothd
--
1.8.3.1
prev parent reply other threads:[~2013-10-23 8:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-23 8:08 [PATCH v2 BlueZ 1/4] android: Fix build dependency of bluetoothd on target Luiz Augusto von Dentz
2013-10-23 8:08 ` [PATCH v2 BlueZ 2/4] android: Fix build dependency of bluetooth.default.so HAL " Luiz Augusto von Dentz
2013-10-23 8:08 ` [PATCH v2 BlueZ 3/4] android: Fix build dependency of haltest " Luiz Augusto von Dentz
2013-10-23 8:08 ` Luiz Augusto von Dentz [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382515699-30338-4-git-send-email-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox