summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2023-10-11 21:56:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-11 21:56:18 +0000
commitfe0a3133ab9f9129512c9f3004d7279c2120fe12 (patch)
treedc0d1c9e9c1bc5cab386d7b9c7f51cd36e1363da
parentf37cd71fe9e03cce38fde2e2725f617da9fb5e5d (diff)
parent7524ada769152849b428d4bb2eb4cc5d3f076f6e (diff)
downloadhikey-fe0a3133ab9f9129512c9f3004d7279c2120fe12.tar.gz
product.prop: set bluetooth.ble.vnd.included to false am: ff724c971c am: a23a57de28 am: 7e8bb02012 am: 05b0a0767d am: 7524ada769
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2778608 Change-Id: I7f923a17b97d6c7e8c1846f9b087d0bf40f36a18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--bluetooth/bdroid_buildcfg.h22
-rw-r--r--device-common.mk1
-rw-r--r--product.prop3
3 files changed, 3 insertions, 23 deletions
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
deleted file mode 100644
index 2315b3de..00000000
--- a/bluetooth/bdroid_buildcfg.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * 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.
- */
-
-#ifndef _BDROID_BUILDCFG_H
-#define _BDROID_BUILDCFG_H
-
-#define BLE_VND_INCLUDED FALSE
-
-#endif
diff --git a/device-common.mk b/device-common.mk
index 217994f2..6cb552c4 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -270,4 +270,3 @@ PRODUCT_PACKAGES += \
suspend_blocker
TARGET_PRODUCT_PROP := $(LOCAL_PATH)/product.prop
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/linaro/hikey/bluetooth
diff --git a/product.prop b/product.prop
index d703af95..64230dcd 100644
--- a/product.prop
+++ b/product.prop
@@ -33,3 +33,6 @@ bluetooth.profile.pbap.server.enabled?=true
bluetooth.profile.sap.server.enabled?=true
bluetooth.profile.ccp.server.enabled?=true
bluetooth.profile.vcp.controller.enabled?=true
+
+# Set BLE vendor specific extensions support to false
+bluetooth.ble.vnd.included?=false