diff options
| author | Anton Hansson <hansson@google.com> | 2019-02-07 08:07:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-07 08:07:06 +0000 |
| commit | 8a76906a7383b2be3bc2bbaac05af851d08191ab (patch) | |
| tree | 600ee7d85fcb7cbb6abb0895faa9cfbdb9317ab4 | |
| parent | 8764e05304333256abff5bf9999a7ef23d539a3b (diff) | |
| parent | 633eb069b73540fc959e45e7e46fe47f7ad73e35 (diff) | |
| download | crosshatch-8a76906a7383b2be3bc2bbaac05af851d08191ab.tar.gz | |
Merge "Use mainline bdroid build config"
| -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 fa3b9187..8811acfc 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -128,7 +128,7 @@ TARGET_FS_CONFIG_GEN := device/google/crosshatch/config.fs QCOM_BOARD_PLATFORMS += sdm845 BOARD_HAVE_BLUETOOTH_QCOM := true BOARD_HAVE_QCOM_FM := false -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/google/crosshatch/bluetooth +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := build/make/target/board/mainline_arm64/bluetooth # Enable dex pre-opt to speed up initial boot ifeq ($(HOST_OS),linux) 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 |