summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2018-07-25 20:37:28 +0000
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2018-07-25 20:37:28 +0000
commit5a2aa1855eff4f46d61e2d532bd0f46d1307ddd4 (patch)
tree7152940e5145116cb782b5ccf55092f77f633ec0
parent44a39ef5c63210d526f99b75a2b3448719498b0d (diff)
parentcf92cd8e298cda8d0550f3e9f826d03d285a8d3c (diff)
downloadangler-sdk-release.tar.gz
Snap for 4912804 from cf92cd8e298cda8d0550f3e9f826d03d285a8d3c to sdk-releasesdk-release
Change-Id: Ia9fa4ec02a0cf78235c78f453784455395d5ff78
-rw-r--r--BoardConfig.mk2
-rw-r--r--bluetooth/bdroid_buildcfg.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index f412575..5b0d11a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -14,6 +14,8 @@
# limitations under the License.
#
+BUILD_BROKEN_DUP_RULES := true
+
TARGET_BOARD_PLATFORM := msm8994
TARGET_BOOTLOADER_BOARD_NAME := angler
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index fb269c9..702d5eb 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -17,8 +17,6 @@
#ifndef _BDROID_BUILDCFG_H
#define _BDROID_BUILDCFG_H
-#define BTM_WBS_INCLUDED TRUE
-#define BTIF_HF_WBS_PREFERRED TRUE
#define BLE_VND_INCLUDED TRUE
#endif