DPM: Fix Build Errors

Fix below build error
================================================
Reason:
    SR 62555 is set to declined
submit/tizen/20160503.014314 is declined(rejected)
Build Error Tizen:Wearable capi-network-bluetooth
================================================

Change-Id: Ide9551687b887c389571ef30a647916fd02409bf
Signed-off-by: h.sandeep <h.sandeep@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 659a36b1b546b5ab4282a31486d0b35e322dd40f..53390df348b5e0113362c84b910388ad0ae41658 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,11 +75,13 @@ src/bluetooth-audio.c
 src/bluetooth-avrcp.c
 src/bluetooth-gatt.c
 src/bluetooth-ipsp.c
-src/bluetooth-dpm.c
 )
 IF (TIZEN_WEARABLE)
 LIST(APPEND SOURCES src/bluetooth-pbap.c)
 ENDIF (TIZEN_WEARABLE)
+IF (TIZEN_MOBILE)
+LIST(APPEND SOURCES src/bluetooth-dpm.c)
+ENDIF (TIZEN_MOBILE)
 ENDIF (TIZEN_TV)
 
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})

diff --git a/packaging/capi-network-bluetooth.spec b/packaging/capi-network-bluetooth.spec
index 7c09912a163b9b91addb8c2a575f48cdcf3017ab..af897d63622524d991bc594901e4a9e9ad748d27 100644 (file)
--- a/packaging/capi-network-bluetooth.spec
+++ b/packaging/capi-network-bluetooth.spec
@@ -82,9 +82,9 @@ export FFLAGS="$FFLAGS -DTIZEN_HFP_DISABLE"
 
 
 %if "%{?profile}" == "mobile"
-export CFLAGS="$CFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT"
-export CXXFLAGS="$CXXFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT"
-export FFLAGS="$FFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT"
+export CFLAGS="$CFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT -DTIZEN_MOBILE"
+export CXXFLAGS="$CXXFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT -DTIZEN_MOBILE"
+export FFLAGS="$FFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT -DTIZEN_MOBILE"
 %endif
 
 export CFLAGS="$CFLAGS -DTIZEN_AUDIO_HF_DISABLE -DTIZEN_IPSP_SUPPORT"
@@ -121,6 +121,7 @@ export FFLAGS+=" -DARCH64"
 %else
 %if "%{?profile}" == "mobile"
        -DTIZEN_WEARABLE=NO \
+       -DTIZEN_MOBILE=YES \
 %endif
 %endif
 %endif

diff --git a/test/bt_unit_test.c b/test/bt_unit_test.c
index 4e76e685648b0c55112d4b8034c8733ed770a059..f65f7bf650b4de569ac0bee61bff8af827302c4b 100644 (file)
--- a/test/bt_unit_test.c
+++ b/test/bt_unit_test.c
@@ -157,8 +157,10 @@ tc_table_t tc_main[] = {
                , BT_UNIT_TEST_TABLE_IPSP},
        {"HDP"
                , BT_UNIT_TEST_TABLE_HDP},
+#ifdef TIZEN_MOBILE
        {"DPM"
                , BT_UNIT_TEST_TABLE_DPM},
+#endif
 #ifdef TIZEN_WEARABLE
        {"HF Role"
                , BT_UNIT_TEST_TABLE_HF},
@@ -826,6 +828,7 @@ tc_table_t tc_HDP[] = {
        {NULL                                   , 0x0000},
 };
 
+#ifdef TIZEN_MOBILE
 tc_table_t tc_DPM[] = {
        /* DPM functions */
        {"BACK"
@@ -908,6 +911,7 @@ tc_table_t tc_DPM[] = {
                , BT_UNIT_TEST_FUNCTION_ACTIVATE_FLAG_TO_SET_PARAMETERS},
        {NULL                                   , 0x0000},
 };
+#endif
 
 #ifdef TIZEN_WEARABLE
 tc_table_t tc_hf[] = {
@@ -1055,9 +1059,11 @@ void tc_usage_print(void)
        case BT_UNIT_TEST_TABLE_HDP:
                tc_table = tc_HDP;
                break;
+#ifdef TIZEN_MOBILE
        case BT_UNIT_TEST_TABLE_DPM:
                tc_table = tc_DPM;
                break;
+#endif
 #ifdef TIZEN_WEARABLE
        case BT_UNIT_TEST_TABLE_HF:
                tc_table = tc_hf;
@@ -3642,6 +3648,7 @@ int test_set_params(int test_id, char *param)
                break;
        }
 
+#ifdef TIZEN_MOBILE
        case BT_UNIT_TEST_TABLE_DPM: {
                switch (test_id) {
                        case BT_UNIT_TEST_FUNCTION_DPM_SET_ALLOW_BLUETOOTH_MODE: {
@@ -3888,6 +3895,7 @@ int test_set_params(int test_id, char *param)
                }
                break;
        }
+#endif
 
        case BT_UNIT_TEST_TABLE_AVRCP: {
                switch (test_id) {
@@ -7520,6 +7528,7 @@ int test_input_callback(void *data)
                }
                        break;
        }
+#ifdef TIZEN_MOBILE
        case BT_UNIT_TEST_TABLE_DPM: {
                switch (test_id) {
                case BT_UNIT_TEST_FUNCTION_DPM_SET_DEFAULT_POLICIES: {
@@ -8030,6 +8039,7 @@ int test_input_callback(void *data)
                }
                break;
        }
+#endif
 #ifdef TIZEN_WEARABLE
        case BT_UNIT_TEST_TABLE_HF: {
                switch (test_id) {

diff --git a/test/bt_unit_test.h b/test/bt_unit_test.h
index 123eb3de1d0b64e706db95f23614d4aae1f21045..75a5efe1ded938ea63d81f25fd3f3a2fe0902c08 100644 (file)
--- a/test/bt_unit_test.h
+++ b/test/bt_unit_test.h
@@ -45,7 +45,9 @@ typedef enum {
        BT_UNIT_TEST_TABLE_HID,
        BT_UNIT_TEST_TABLE_IPSP,
        BT_UNIT_TEST_TABLE_HDP,
+#ifdef TIZEN_MOBILE
        BT_UNIT_TEST_TABLE_DPM,
+#endif
 #ifdef TIZEN_WEARABLE
        BT_UNIT_TEST_TABLE_HF,
        BT_UNIT_TEST_TABLE_PBAP_CLIENT,
@@ -341,6 +343,7 @@ typedef enum {
        BT_UNIT_TEST_FUNCTION_HDP_UNSET_CONNECTION_CB,
        BT_UNIT_TEST_FUNCTION_HDP_SET_DATA_RECEIVED_CB,
        BT_UNIT_TEST_FUNCTION_HDP_UNSET_DATA_RECEIVED_CB,
+#ifdef TIZEN_MOBILE
        BT_UNIT_TEST_FUNCTION_DPM_SET_DEFAULT_POLICIES = 1,
        BT_UNIT_TEST_FUNCTION_DPM_SET_ALLOW_BLUETOOTH_MODE,
        BT_UNIT_TEST_FUNCTION_DPM_GET_ALLOW_BLUETOOTH_MODE,
@@ -378,6 +381,7 @@ typedef enum {
        BT_UNIT_TEST_FUNCTION_DPM_GET_LIMITED_DISCOVERABLE_STATE,
        BT_UNIT_TEST_FUNCTION_DPM_SET_DATA_TRANSFER_STATE,
        BT_UNIT_TEST_FUNCTION_DPM_GET_DATA_TRANSFER_STATE,
+#endif
 #ifdef TIZEN_WEARABLE
        BT_UNIT_TEST_FUNCTION_HF_INITIALIZE = 1,
        BT_UNIT_TEST_FUNCTION_HF_DEINITIALIZE,