diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-07-25 20:36:20 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-07-25 20:36:20 +0000 |
| commit | 9704da6e2ceb8d84cf021919843ae6d2f9207044 (patch) | |
| tree | 84d3704bbe9b21c6771acb2a55607f690d088870 | |
| parent | 7656b6de01b1f7eeb0ece8d36ad1596c12dde847 (diff) | |
| parent | 2994b6be2bf0191c73e5d4ceee1833119c99ab96 (diff) | |
| download | bullhead-sdk-release.tar.gz | |
Snap for 4912804 from 2994b6be2bf0191c73e5d4ceee1833119c99ab96 to sdk-releasesdk-release
Change-Id: I344cb3b09c207dc09e44e75692d306e3980099ae
| -rw-r--r-- | BoardConfig.mk | 2 | ||||
| -rw-r--r-- | bluetooth/bdroid_buildcfg.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index b256fa0..0e6e0fb 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,6 +14,8 @@ # limitations under the License. # +BUILD_BROKEN_DUP_RULES := true + TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-a TARGET_CPU_ABI := arm64-v8a diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h index f079b01..c59dcdd 100644 --- a/bluetooth/bdroid_buildcfg.h +++ b/bluetooth/bdroid_buildcfg.h @@ -20,8 +20,5 @@ #define BLE_VND_INCLUDED TRUE #define BTA_DISABLE_DELAY 1000 /* in milliseconds */ -#define BTM_WBS_INCLUDED TRUE /* Enable WBS */ -#define BTIF_HF_WBS_PREFERRED TRUE /* Use WBS */ - #define BT_CLEAN_TURN_ON_DISABLED 1 #endif |