From e7cd045ee4b9c09bff2785dead178e15ae256af3 Mon Sep 17 00:00:00 2001 From: "jihwan.seo" Date: Mon, 14 Nov 2016 12:38:53 +0900 Subject: [PATCH] [IOT-1540] replace the path for BLE connection manager Change-Id: Id6e2adf906bcd86586ebe7743b626fdd6a00944f Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/14271 Tested-by: jenkins-iotivity Reviewed-by: Ashok Babu Channa --- resource/csdk/connectivity/util/SConscript | 8 ++++---- .../src/camanager/{ => bt_le_manager}/android/caleautoconnector.c | 0 .../src/camanager/{ => bt_le_manager}/android/caleautoconnector.h | 0 .../camanager/{ => bt_le_manager}/android/caleconnectionmanager.c | 0 .../src/camanager/{ => bt_le_manager}/android/camanagerdevice.c | 0 .../src/camanager/{ => bt_le_manager}/android/camanagerdevice.h | 0 .../src/camanager/{ => bt_le_manager}/android/camanagerleutil.c | 0 .../src/camanager/{ => bt_le_manager}/android/camanagerleutil.h | 0 .../camanager/{ => bt_le_manager}/tizen/caleconnectionmanager.c | 0 9 files changed, 4 insertions(+), 4 deletions(-) rename resource/csdk/connectivity/util/src/camanager/{ => bt_le_manager}/android/caleautoconnector.c (100%) rename resource/csdk/connectivity/util/src/camanager/{ => bt_le_manager}/android/caleautoconnector.h (100%) rename resource/csdk/connectivity/util/src/camanager/{ => bt_le_manager}/android/caleconnectionmanager.c (100%) rename resource/csdk/connectivity/util/src/camanager/{ => bt_le_manager}/android/camanagerdevice.c (100%) rename resource/csdk/connectivity/util/src/camanager/{ => bt_le_manager}/android/camanagerdevice.h (100%) rename resource/csdk/connectivity/util/src/camanager/{ => bt_le_manager}/android/camanagerleutil.c (100%) rename resource/csdk/connectivity/util/src/camanager/{ => bt_le_manager}/android/camanagerleutil.h (100%) rename resource/csdk/connectivity/util/src/camanager/{ => bt_le_manager}/tizen/caleconnectionmanager.c (100%) diff --git a/resource/csdk/connectivity/util/SConscript b/resource/csdk/connectivity/util/SConscript index c89cb4c..d826a42 100644 --- a/resource/csdk/connectivity/util/SConscript +++ b/resource/csdk/connectivity/util/SConscript @@ -23,10 +23,10 @@ env.AppendUnique(CA_SRC = [os.path.join('./../util/src/cautilinterface.c')]) if target_os == 'android': if (('BLE' in ca_transport) or ('ALL' in ca_transport)): env.AppendUnique(CA_SRC = [ - os.path.join(src_dir, 'camanager', 'android', 'caleconnectionmanager.c'), - os.path.join(src_dir, 'camanager', 'android', 'caleautoconnector.c'), - os.path.join(src_dir, 'camanager', 'android', 'camanagerleutil.c'), - os.path.join(src_dir, 'camanager', 'android', 'camanagerdevice.c')]) + os.path.join(src_dir, 'camanager', 'bt_le_manager', 'android', 'caleconnectionmanager.c'), + os.path.join(src_dir, 'camanager', 'bt_le_manager', 'android', 'caleautoconnector.c'), + os.path.join(src_dir, 'camanager', 'bt_le_manager', 'android', 'camanagerleutil.c'), + os.path.join(src_dir, 'camanager', 'bt_le_manager', 'android', 'camanagerdevice.c')]) if (('BT' in ca_transport) or ('ALL' in ca_transport)): env.AppendUnique(CA_SRC = [ diff --git a/resource/csdk/connectivity/util/src/camanager/android/caleautoconnector.c b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleautoconnector.c similarity index 100% rename from resource/csdk/connectivity/util/src/camanager/android/caleautoconnector.c rename to resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleautoconnector.c diff --git a/resource/csdk/connectivity/util/src/camanager/android/caleautoconnector.h b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleautoconnector.h similarity index 100% rename from resource/csdk/connectivity/util/src/camanager/android/caleautoconnector.h rename to resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleautoconnector.h diff --git a/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c similarity index 100% rename from resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c rename to resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c diff --git a/resource/csdk/connectivity/util/src/camanager/android/camanagerdevice.c b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerdevice.c similarity index 100% rename from resource/csdk/connectivity/util/src/camanager/android/camanagerdevice.c rename to resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerdevice.c diff --git a/resource/csdk/connectivity/util/src/camanager/android/camanagerdevice.h b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerdevice.h similarity index 100% rename from resource/csdk/connectivity/util/src/camanager/android/camanagerdevice.h rename to resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerdevice.h diff --git a/resource/csdk/connectivity/util/src/camanager/android/camanagerleutil.c b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerleutil.c similarity index 100% rename from resource/csdk/connectivity/util/src/camanager/android/camanagerleutil.c rename to resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerleutil.c diff --git a/resource/csdk/connectivity/util/src/camanager/android/camanagerleutil.h b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerleutil.h similarity index 100% rename from resource/csdk/connectivity/util/src/camanager/android/camanagerleutil.h rename to resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerleutil.h diff --git a/resource/csdk/connectivity/util/src/camanager/tizen/caleconnectionmanager.c b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/tizen/caleconnectionmanager.c similarity index 100% rename from resource/csdk/connectivity/util/src/camanager/tizen/caleconnectionmanager.c rename to resource/csdk/connectivity/util/src/camanager/bt_le_manager/tizen/caleconnectionmanager.c -- 2.7.4