Bluetooth_ext: Enable certification tools for compilation
- Enable certification tools for compilation.
- This change fixes compilation issues in certification tools
in Q Release.
CRs-Fixed: 2391250
Change-Id: I1086705396ffff5f44ed0aacba2fd790c080e483
diff --git a/Android.mk b/Android.mk
index f0d1960..5701414 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,8 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
+TMP_LOCAL_PATH := $(LOCAL_PATH)
+
include $(LOCAL_PATH)/BATestApp/Android.mk
+include $(TMP_LOCAL_PATH)/certification_tools/Android.mk
diff --git a/certification_tools/blegatt_test/Android.mk b/certification_tools/blegatt_test/Android.mk
index 653c5e1..9c0d1a4 100644
--- a/certification_tools/blegatt_test/Android.mk
+++ b/certification_tools/blegatt_test/Android.mk
@@ -6,7 +6,7 @@
LOCAL_C_INCLUDES += . \
vendor/qcom/opensource/commonsys/system/bt/stack/include \
- vendor/qcom/opensource/commonsys/system/bt/include \
+ system/bt/include \
system/bt/types \
vendor/qcom/opensource/commonsys/system/bt/internal_include \
vendor/qcom/opensource/commonsys/system/bt/stack/l2cap \
diff --git a/certification_tools/blegatt_test/gatt_test.cpp b/certification_tools/blegatt_test/gatt_test.cpp
index 74c5092..8c78d82 100644
--- a/certification_tools/blegatt_test/gatt_test.cpp
+++ b/certification_tools/blegatt_test/gatt_test.cpp
@@ -68,6 +68,7 @@
#include <time.h>
#include <base/bind.h>
+#include <base/callback.h>
using bluetooth::Uuid;
#define bluetooth_module_t "bluetooth_test"
@@ -117,6 +118,11 @@
#define INTERVAL_MEDIUM 2
#define INTERVAL_HIGH 3
+#define L2CAP_LE_DEFAULT_MTU 512
+#define L2CAP_LE_DEFAULT_MPS 230
+#define L2CAP_LE_MAX_CREDIT 65535
+#define L2CAP_LE_DEFAULT_CREDIT 1
+
/************************************************************************************
** Local type definitions
************************************************************************************/
@@ -2524,7 +2530,8 @@
timeout = get_hex(&p, -1);
if(FALSE == GetBdAddr(p, &bd_addr)) return;
- Ret = sGattIfaceScan->client->conn_parameter_update(bd_addr, min_interval, max_interval, latency, timeout);
+ Ret = sGattIfaceScan->client->conn_parameter_update(bd_addr, min_interval,
+ max_interval, latency, timeout, 0, 0);
printf("%s:: Ret=%d \n", __FUNCTION__, Ret);
}
diff --git a/certification_tools/l2test_ertm/Android.mk b/certification_tools/l2test_ertm/Android.mk
index 4ca568f..75f15ff 100644
--- a/certification_tools/l2test_ertm/Android.mk
+++ b/certification_tools/l2test_ertm/Android.mk
@@ -6,7 +6,7 @@
LOCAL_C_INCLUDES += . \
vendor/qcom/opensource/commonsys/system/bt/stack/include \
- vendor/qcom/opensource/commonsys/system/bt/include \
+ system/bt/include \
system/bt/types \
vendor/qcom/opensource/commonsys/system/bt/internal_include \
vendor/qcom/opensource/commonsys/system/bt/stack/l2cap \
diff --git a/certification_tools/mcap_tool/Android.mk b/certification_tools/mcap_tool/Android.mk
index 602d3a2..de77168 100644
--- a/certification_tools/mcap_tool/Android.mk
+++ b/certification_tools/mcap_tool/Android.mk
@@ -6,7 +6,7 @@
LOCAL_C_INCLUDES += . \
vendor/qcom/opensource/commonsys/system/bt/stack/include \
- vendor/qcom/opensource/commonsys/system/bt/include \
+ system/bt/include \
system/bt/types \
vendor/qcom/opensource/commonsys/system/bt/internal_include \
vendor/qcom/opensource/commonsys/system/bt/stack/l2cap \
diff --git a/certification_tools/rfcommtest/Android.mk b/certification_tools/rfcommtest/Android.mk
index dcd1d0e..a42dacd 100644
--- a/certification_tools/rfcommtest/Android.mk
+++ b/certification_tools/rfcommtest/Android.mk
@@ -6,7 +6,7 @@
LOCAL_C_INCLUDES += . \
vendor/qcom/opensource/commonsys/system/bt/stack/include \
- vendor/qcom/opensource/commonsys/system/bt/include \
+ system/bt/include \
system/bt/types \
vendor/qcom/opensource/commonsys/system/bt/internal_include \
vendor/qcom/opensource/commonsys/system/bt/stack/l2cap \