Add support for per device bluetooth configuration.

Bug: 6837125
Change-Id: Ief08fc116ab644e8c4f8668008561117b51a8956

2 files changed, 26 insertions, 4 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9f9d389..2e739d5 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Default values, possibly overridden by BoardConfigVendor.mk
+TARGET_BOARD_INFO_FILE := device/samsung/maguro/board-info.txt
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/maguro/bluetooth
+
 # Use the non-open-source part, if present
 -include vendor/samsung/maguro/BoardConfigVendor.mk
 
-# Use the open-source board-info file if none was set by the vendor
-# config.
-TARGET_BOARD_INFO_FILE ?= device/samsung/maguro/board-info.txt
-
 # Use the part that is common between all tunas
 include device/samsung/tuna/BoardConfig.mk
 
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
new file mode 100644
index 0000000..5c61b6c
--- /dev/null
+++ b/bluetooth/bdroid_buildcfg.h
@@ -0,0 +1,22 @@
+/*
+ * 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
+
+#define BTM_DEF_LOCAL_NAME   "Galaxy Nexus 2"
+
+#endif