From 8cc714313cdcba791e89a5eb8ae164363d75c8e4 Mon Sep 17 00:00:00 2001
From: Jack He <siyuanh@google.com>
Date: Thu, 8 Dec 2016 15:45:07 -0800
Subject: [PATCH] Add Android.bp variables to the soong build parser

* BtConfigIncludeDir: BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR
* BtHcilpIncluded: BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED
* BtHciUseMct: BLUETOOTH_HCI_USE_MCT

Bug: 32958753
Test: Code compilation, no user visible effects

Change-Id: I0dc53172ee823e4e0fa69749e1297713796538cf
---
 android/config.go   | 13 +++++++++++++
 android/variable.go |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/android/config.go b/android/config.go
index 7d268fc4b..6d286802f 100644
--- a/android/config.go
+++ b/android/config.go
@@ -29,6 +29,7 @@ import (
 )
 
 var Bool = proptools.Bool
+var String = proptools.String
 
 // The configuration file name
 const configFileName = "soong.config"
@@ -460,3 +461,15 @@ func (c *deviceConfig) VndkVersion() string {
 	}
 	return *c.config.ProductVariables.DeviceVndkVersion
 }
+
+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 e6abee625..271454a6f 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -138,6 +138,10 @@ type productVariables struct {
 	SanitizeDeviceArch []string `json:",omitempty"`
 
 	ArtUseReadBarrier *bool `json:",omitempty"`
+
+	BtConfigIncludeDir *string `json:",omitempty"`
+	BtHcilpIncluded    *string `json:",omitempty"`
+	BtHciUseMct        *bool   `json:",omitempty"`
 }
 
 func boolPtr(v bool) *bool {