Merge "bluetooth: disable BLE_VND_INCLUDED" am: 454721f93e am: ba471ce883 am: 98acb0c36f am: df3751fcc9 am: af8ebda0a0
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2116500
Change-Id: I92100ecff5b9ccfdbd26fece4e2184df53fc6f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
new file mode 100644
index 0000000..2315b3d
--- /dev/null
+++ b/bluetooth/bdroid_buildcfg.h
@@ -0,0 +1,22 @@
+/*
+ * 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 bd5c06a..e0df5a4 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -273,3 +273,4 @@
suspend_blocker
TARGET_PRODUCT_PROP := $(LOCAL_PATH)/product.prop
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/linaro/hikey/bluetooth