Merge "Remove vnd directory" into main

system/bta/Android.bp

@@ -27,7 +27,6 @@ cc_defaults {
         "packages/modules/Bluetooth/system/stack/btm",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/udrv/include",
-        "packages/modules/Bluetooth/system/vnd/include",
     ],
     header_libs: ["libbluetooth_headers"],
     generated_headers: [

system/btif/Android.bp

@@ -28,7 +28,6 @@ btifCommonIncludes = [
     "packages/modules/Bluetooth/system/stack/include",
     "packages/modules/Bluetooth/system/stack/l2cap",
     "packages/modules/Bluetooth/system/udrv/include",
-    "packages/modules/Bluetooth/system/vnd/include",
     "system/libhwbinder/include",
 ]
 
@@ -534,7 +533,6 @@ cc_test {
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/stack/l2cap",
         "packages/modules/Bluetooth/system/udrv/include",
-        "packages/modules/Bluetooth/system/vnd/include",
         "system/libfmq/include",
         "system/libhwbinder/include",
     ],
@@ -668,7 +666,6 @@ cc_test {
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/stack/l2cap",
         "packages/modules/Bluetooth/system/udrv/include",
-        "packages/modules/Bluetooth/system/vnd/include",
         "system/libfmq/include",
         "system/libhwbinder/include",
     ],

system/btif/src/btif_gatt_client.cc

@@ -54,7 +54,6 @@
 #include "types/bluetooth/uuid.h"
 #include "types/bt_transport.h"
 #include "types/raw_address.h"
-#include "vendor_api.h"
 
 using base::Bind;
 using base::Owned;

system/gd/l2cap/fuzz/Android.bp

@@ -28,7 +28,6 @@ cc_fuzz {
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/stack/l2cap",
         "packages/modules/Bluetooth/system/udrv/include",
-        "packages/modules/Bluetooth/system/vnd/include",
         "system/security/keystore/include",
     ],
     srcs: [

system/main/Android.bp

@@ -43,7 +43,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/stack/l2cap",
         "packages/modules/Bluetooth/system/udrv/include",
-        "packages/modules/Bluetooth/system/vnd/include",
         "system/security/keystore/include",
     ],
     generated_headers: [
@@ -86,7 +85,6 @@ cc_library {
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/stack/l2cap",
         "packages/modules/Bluetooth/system/udrv/include",
-        "packages/modules/Bluetooth/system/vnd/include",
         "system/security/keystore/include",
     ],
     shared_libs: [

system/stack/Android.bp

@@ -70,8 +70,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system/gd/hal",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/udrv/include",
-        "packages/modules/Bluetooth/system/vnd/ble",
-        "packages/modules/Bluetooth/system/vnd/include",
     ],
     generated_headers: [
         "BluetoothGeneratedDumpsysDataSchema_h",
@@ -198,8 +196,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/udrv/include",
-        "packages/modules/Bluetooth/system/vnd/ble",
-        "packages/modules/Bluetooth/system/vnd/include",
     ],
     srcs: crypto_toolbox_srcs + [
         ":LegacyStackSdp",
@@ -1357,7 +1353,6 @@ cc_test {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/device/include",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/vnd/ble",
     ],
     generated_headers: [
         "BluetoothGeneratedDumpsysDataSchema_h",
@@ -1477,7 +1472,6 @@ cc_test {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/vnd/ble",
     ],
     srcs: crypto_toolbox_srcs + [
         ":TestCommonMockFunctions",

system/stack/btm/btm_ble_privacy.cc

@@ -31,11 +31,12 @@
 #include "stack/btm/btm_dev.h"
 #include "stack/include/bt_octets.h"
 #include "types/raw_address.h"
-#include "vendor_hcidefs.h"
 
 extern tBTM_CB btm_cb;
 
 /* RPA offload VSC specifics */
+#define HCI_VENDOR_BLE_RPA_VSC (0x0155 | HCI_GRP_VENDOR_SPECIFIC)
+
 #define BTM_BLE_META_IRK_ENABLE 0x01
 #define BTM_BLE_META_ADD_IRK_ENTRY 0x02
 #define BTM_BLE_META_REMOVE_IRK_ENTRY 0x03

system/test/suite/Android.bp

@@ -32,7 +32,6 @@ cc_defaults {
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/stack/l2cap",
         "packages/modules/Bluetooth/system/udrv/include",
-        "packages/modules/Bluetooth/system/vnd/include",
         "system/libfmq/include",
         "system/libhwbinder/include",
     ],

system/vnd/ble/vendor_hcidefs.h

-/******************************************************************************
- *
- *  Copyright 2003-2014 Broadcom Corporation
- *
- *  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.
- *
- ******************************************************************************/
-
-/*****************************************************************************
- *
- *  Name        vendor_hcidefs.h
- *
- *  Function    This file contains Broadcom Specific Host Controller Interface
- *              definitions.
- *
- *****************************************************************************/
-
-#ifndef VENDOR_HCIDEFS_H
-#define VENDOR_HCIDEFS_H
-
-/*****************************************************************************
- * Private address resolution VSC
- *****************************************************************************/
-
-/* VSC */
-#define HCI_VENDOR_BLE_RPA_VSC (0x0155 | HCI_GRP_VENDOR_SPECIFIC)
-
-/* Sub codes */
-#define HCI_VENDOR_BLE_RPA_ENABLE 0x01
-#define HCI_VENDOR_BLE_RPA_ADD_IRK 0x02
-#define HCI_VENDOR_BLE_RPA_REMOVE_IRK 0x03
-#define HCI_VENDOR_BLE_RPA_CLEAR_IRK 0x04
-#define HCI_VENDOR_BLE_RPA_READ_IRK 0x05
-
-/*****************************************************************************
- * Advertising data payload filter VSC
- *****************************************************************************/
-
-/* VSC */
-#define HCI_VENDOR_BLE_PCF_VSC (0x0157 | HCI_GRP_VENDOR_SPECIFIC)
-
-#endif

system/vnd/include/vendor_api.h

-/****************************************************************************
- *
- * Name:         vendor_api.h
- *
- * Description:  Vendor specific BTE API function external definitions.
- *
- * Copyright (c) 2009-2011, BROADCOM Inc., All Rights Reserved.
- * Broadcom Bluetooth Core. Proprietary and confidential.
- *
- *****************************************************************************/
-#ifndef VENDOR_API_H
-#define VENDOR_API_H
-
-#include "btm_api.h"
-
-/****************************************************************************
- *  Resolvable private address offload VSC specific definitions
- *****************************************************************************/
-
-enum { BTM_BLE_PRIVACY_ENABLE, BTM_BLE_PRIVACY_DISABLE };
-
-#endif