diff options
| author | Matthew Xie <mattx@google.com> | 2013-05-09 21:11:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-09 21:11:41 +0000 |
| commit | f3fad05b7d25c9fa83dc6dc193bf407d806cb5c9 (patch) | |
| tree | 4c13769335832fcfd125308060f29b82116df15f | |
| parent | 83889e7132665e6e88e69bdf44b91ede255755d9 (diff) | |
| parent | de03222e33a80d3f337386410101643bbbede639 (diff) | |
| download | grouper-f3fad05b7d25c9fa83dc6dc193bf407d806cb5c9.tar.gz | |
Merge "Turn off BLE, GATT, and SMP of Bluetooth stack" into jb-mr2-dev
| -rw-r--r-- | bluetooth/bdroid_buildcfg.h | 4 | ||||
| -rw-r--r-- | device-common.mk | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h index aa61dba..3a0fbe1 100644 --- a/bluetooth/bdroid_buildcfg.h +++ b/bluetooth/bdroid_buildcfg.h @@ -27,5 +27,7 @@ #define BTIF_HF_SERVICES (BTA_HSP_SERVICE_MASK) #define BTIF_HF_SERVICE_NAMES { BTIF_HSAG_SERVICE_NAME } #define PAN_NAP_DISABLED TRUE - +#define BLE_INCLUDED FALSE +#define BTA_GATT_INCLUDED FALSE +#define SMP_INCLUDED FALSE #endif diff --git a/device-common.mk b/device-common.mk index 89e4af1..da4a424 100644 --- a/device-common.mk +++ b/device-common.mk @@ -58,8 +58,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \ - frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \ - frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml + frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml PRODUCT_COPY_FILES += \ device/asus/grouper/elan-touchscreen.idc:system/usr/idc/elan-touchscreen.idc \ |