summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-05-09 16:23:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-09 16:23:23 -0700
commitb1a97996c8cd06367bd2316d5c7d53b71e6798ea (patch)
tree9654ca15bc2f88362107fe48a29487e3e439c431
parent50ecc1a1ccd58bbcf8fc9f4576cdbb66efd40069 (diff)
parent55272b3a4e917143012a77d937ca2670ec26e0fb (diff)
downloadtuna-b1a97996c8cd06367bd2316d5c7d53b71e6798ea.tar.gz
am 55272b3a: Turn off BLE, GATT, and SMP of Bluetooth stack
* commit '55272b3a4e917143012a77d937ca2670ec26e0fb': Turn off BLE, GATT, and SMP of Bluetooth stack
-rw-r--r--bluetooth/bdroid_buildcfg.h5
-rw-r--r--device.mk3
2 files changed, 5 insertions, 3 deletions
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index 5c61b6c..9e6899c 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -17,6 +17,9 @@
#ifndef _BDROID_BUILDCFG_H
#define _BDROID_BUILDCFG_H
-#define BTM_DEF_LOCAL_NAME "Galaxy Nexus 2"
+#define BTM_DEF_LOCAL_NAME "Galaxy Nexus"
+#define BLE_INCLUDED FALSE
+#define BTA_GATT_INCLUDED FALSE
+#define SMP_INCLUDED FALSE
#endif
diff --git a/device.mk b/device.mk
index 0a8974c..3501de9 100644
--- a/device.mk
+++ b/device.mk
@@ -142,8 +142,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
- frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
- frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
+ frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml
# Melfas touchscreen firmware
PRODUCT_COPY_FILES += \