diff options
| author | Anton Hansson <hansson@google.com> | 2019-02-08 08:51:11 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2019-02-08 08:51:11 +0000 |
| commit | 834e3eef96985fd04eff41f63d24230266824303 (patch) | |
| tree | 34ae5bcffd98c81416cb33fdd69793a9770eba39 | |
| parent | b114cb148c522e5e82aad3d42a6399624ae92f0f (diff) | |
| download | bonito-834e3eef96985fd04eff41f63d24230266824303.tar.gz | |
Use mainline bdroid build config
Consolidate this duplicated config to a single config. The
new config only defines the BLE_VND_INCLUDED flag, but the
other flags were never read.
Bug: 123695868
Test: presubmit
Change-Id: I47a16d67dc534513b079b7546c9d605f3bf05348
| -rw-r--r-- | BoardConfig-common.mk | 2 | ||||
| -rw-r--r-- | bluetooth/bdroid_buildcfg.h | 35 |
2 files changed, 1 insertions, 36 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index ccaeeb34..37b7aa7c 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -132,7 +132,7 @@ TARGET_FS_CONFIG_GEN := device/google/bonito/config.fs QCOM_BOARD_PLATFORMS += sdm710 BOARD_HAVE_BLUETOOTH_QCOM := true -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/google/bonito/bluetooth +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := build/make/target/board/mainline_arm64/bluetooth # Camera TARGET_USES_AOSP := true diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h deleted file mode 100644 index 63515b1f..00000000 --- a/bluetooth/bdroid_buildcfg.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * - * Copyright (c) 2013, The Linux Foundation. All rights reserved. - * Not a Contribution, Apache license notifications and license are retained - * for attribution purposes only. - * - * 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 - -// Wide-band speech support -#define BTM_WBS_INCLUDED TRUE -#define BTIF_HF_WBS_PREFERRED TRUE - -// Google VSC spec support -#define BLE_VND_INCLUDED TRUE - -// QCOM power management workaround -#define BT_CLEAN_TURN_ON_DISABLED TRUE - -#endif |