From ee8e7a7a2c22fbbe9228393f71c6ab2110bd2aa0 Mon Sep 17 00:00:00 2001
From: Jack He <siyuanh@google.com>
Date: Thu, 9 Feb 2017 14:26:18 -0800
Subject: [PATCH] Removed Bluetooth build  variables from the soong build
 parser

* Removed BLUETOOTH_HCI_USE_MCT
* Removed BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED

Bug: 34951912, 35203653
Test: Code compilation, no visible user effects
Change-Id: I89af075a334f2ec7b2a3046a4aaa5bcc19d454e0
---
 android/config.go   | 8 --------
 android/variable.go | 2 --
 2 files changed, 10 deletions(-)

diff --git a/android/config.go b/android/config.go
index 76635b39e..eaacef718 100644
--- a/android/config.go
+++ b/android/config.go
@@ -471,11 +471,3 @@ func (c *deviceConfig) VndkVersion() string {
 func (c *deviceConfig) BtConfigIncludeDir() string {
 	return String(c.config.ProductVariables.BtConfigIncludeDir)
 }
-
-func (c *deviceConfig) BtHcilpIncluded() string {
-	return String(c.config.ProductVariables.BtHcilpIncluded)
-}
-
-func (c *deviceConfig) BtHciUseMct() bool {
-	return Bool(c.config.ProductVariables.BtHciUseMct)
-}
diff --git a/android/variable.go b/android/variable.go
index bb84be289..24c58dff4 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -141,8 +141,6 @@ type productVariables struct {
 	ArtUseReadBarrier *bool `json:",omitempty"`
 
 	BtConfigIncludeDir *string `json:",omitempty"`
-	BtHcilpIncluded    *string `json:",omitempty"`
-	BtHciUseMct        *bool   `json:",omitempty"`
 }
 
 func boolPtr(v bool) *bool {