Removed vestigial automatic download of BlueZ.

The IoTivity Linux BLE transport no longer relies on headers found in
the BlueZ source distribution, such as <bluetooth/hci.h>, since it no
longer uses the kernel Bluetooth management API for LE advertising
related tasks.  LE advertising operations are now handled entirely
through BlueZ D-Bus API method calls.

Change-Id: I64ef5faac2fdac7aa15e2091b9a3bf44b786e1e5
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2031
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/extlibs/bluez/SConscript b/extlibs/bluez/SConscript
deleted file mode 100644 (file)
index 05b2b1b..0000000
--- a/extlibs/bluez/SConscript
+++ /dev/null
@@ -1,77 +0,0 @@
-# ------------------------------------------------------------------------
-# Copyright 2015 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ------------------------------------------------------------------------
-
-######################################################################
-# BlueZ download script
-#
-# BlueZ is currently only used by the IoTivity Linux BLE transport.
-# The IoTivity Linux BLE transport depends on two headers found in the
-# BlueZ bluetooth library: <bluetooth/bluetooth.h> and
-# <bluetooth/hci.h>.  Those headers are used solely when pulling in
-# the types and constants necessary to a create kernel Bluetooth
-# management socket.  There is no need to link BlueZ's libbluetooth
-# library.
-######################################################################
-import os
-import subprocess
-
-Import('env')
-
-# First check if the BlueZ bluetooth library development files are
-# installed.  Add the location of the bluetooth library headers to the
-# include path if they are installed.  Otherwise, download the BlueZ
-# source code and adjust the include path, accordingly.
-
-# The subprocess.run() function became available in Python 3.5.  Use
-# the older high-level API instead, since some installations may still
-# be using older versions of Python.
-bluez_installed = (subprocess.call([ 'pkg-config',
-                                     'bluez',
-                                     '--exists' ]) == 0)
-
-if bluez_installed:
-        env.ParseConfig("pkg-config bluez --cflags-only-I")
-        Return()
-
-if not os.path.exists('bluez'):
-        bluez = env.Action([
-                'git clone git://git.kernel.org/pub/scm/bluetooth/bluez.git',
-                'cd bluez && ln -s lib bluetooth && cd -'])
-
-        print 'Downloading BlueZ ...'
-        if env.Execute(bluez):
-                print '''
-*********************************** Error *********************************
-* Please download Bluez 5.32 or better, build it and install it.          *
-* Alternatively, but less preferrably, create a symbolic as follows       *
-*     $ cd  extlibs/bluez                                                 *
-*     $ git clone git://git.kernel.org/pub/scm/bluetooth/bluez.git        *
-*     $ cd bluez                                                          *
-*     $ ln -s lib bluetooth                                               *
-*     $ cd ../../..                                                       *
-***************************************************************************
-'''
-                Exit(1)
-        else:
-                print 'BlueZ download complete.'
-
-env.AppendUnique(CPPPATH = ['#extlibs/bluez/bluez'])
-
-
-# Local Variables:
-# mode:python
-# indent-tabs-mode: nil
-# End:

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/linux/SConscript b/resource/csdk/connectivity/src/bt_le_adapter/linux/SConscript
index 64f3a16..bbf1674 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/linux/SConscript
+++ b/resource/csdk/connectivity/src/bt_le_adapter/linux/SConscript
@@ -22,12 +22,6 @@ Import('env')
 
 import os.path
 
-# Make sure the <bluetooth/bluetooth.h> and <bluetooth/hci.h> headers
-# necessary for use of the kernel Bluetooth management API are
-# available.  Only those headers are required.  There is no need to
-# build BlueZ in order to build IoTivity's BLE transport for Linux.
-env.SConscript('#extlibs/bluez/SConscript')
-
 # Top-level build (variant) directory.
 root_build_dir = env['BUILD_DIR']