add an external for bluez_bluetooth_headers

Change-Id: Idf48f9a5c2245f6696688a17a0fa3809ae751582

RepositoryExternal.mk

@@ -142,6 +142,22 @@ gb_LinkTarget__use_sane_headers :=
 
 endif
 
+ifeq ($(SYSTEM_BLUEZ),YES)
+
+gb_LinkTarget__use_bluez_bluetooth_headers :=
+
+else # !SYSTEM_BLUEZ
+
+define gb_LinkTarget__use_bluez_bluetooth_headers
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(SRCDIR)/external/bluez_bluetooth/inc \
+	$$(INCLUDE) \
+)
+
+endef
+
+endif # SYSTEM_BLUEZ
+
 # External libraries
 
 ifeq ($(SYSTEM_CPPUNIT),YES)

sd/Library_sd.mk

@@ -44,12 +44,6 @@ $(eval $(call gb_Library_set_include,sd,\
 	-I$(WORKDIR)/SdiTarget/sd/sdi \
 ))
 
-ifneq ($(SYSTEM_BLUEZ),YES)
-$(eval $(call gb_Library_add_cxxflags,sd,\
-	-I$(SRCDIR)/external/bluez_bluetooth/inc \
-))
-endif
-
 $(eval $(call gb_Library_add_defs,sd,\
 	-DSD_DLLIMPLEMENTATION \
 ))
@@ -101,6 +95,7 @@ $(eval $(call gb_Library_use_libraries,sd,\
 
 ifeq ($(OS), LINUX)
 $(eval $(call gb_Library_use_externals,sd,\
+	bluez_bluetooth_headers \
 	boost_headers \
 	libxml2 \
 	dbus \
@@ -110,6 +105,7 @@ $(eval $(call gb_Library_use_externals,sd,\
 ))
 else
 $(eval $(call gb_Library_use_externals,sd,\
+	bluez_bluetooth_headers \
 	boost_headers \
 	libxml2 \
 	dbus \