diff options
| author | Zhihai Xu <zhihaixu@google.com> | 2012-09-20 16:42:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-20 16:42:47 -0700 |
| commit | d81b9d220e00a9ffecea3b9067c6416b2c1e6bbd (patch) | |
| tree | bb9fcdd6ba95dcc433404327490751baad1c056a /target | |
| parent | fe1d3b12de3b9dad5fa1b84115602bd6e9f32767 (diff) | |
| parent | 3849760809ac3bde46663ad163ea0a0d592450c1 (diff) | |
| download | build-d81b9d220e00a9ffecea3b9067c6416b2c1e6bbd.zip build-d81b9d220e00a9ffecea3b9067c6416b2c1e6bbd.tar.gz build-d81b9d220e00a9ffecea3b9067c6416b2c1e6bbd.tar.bz2 | |
Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
Diffstat (limited to 'target')
| -rw-r--r-- | target/product/generic_no_telephony.mk | 12 | ||||
| -rw-r--r-- | target/product/mini.mk | 7 |
2 files changed, 0 insertions, 19 deletions
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index a299e7f..5d6d873 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk @@ -47,14 +47,7 @@ PRODUCT_PACKAGES := \ PRODUCT_PACKAGES += \ audio \ - bluetoothd \ - brcm_patchram_plus \ dhcpcd.conf \ - hciattach \ - libbluedroid \ - libbluetooth \ - libbluetoothd \ - libglib \ network \ pand \ pppd \ @@ -82,11 +75,6 @@ PRODUCT_PACKAGES += \ local_time.default PRODUCT_COPY_FILES := \ - system/bluetooth/data/audio.conf:system/etc/bluetooth/audio.conf \ - system/bluetooth/data/auto_pairing.conf:system/etc/bluetooth/auto_pairing.conf \ - system/bluetooth/data/blacklist.conf:system/etc/bluetooth/blacklist.conf \ - system/bluetooth/data/input.conf:system/etc/bluetooth/input.conf \ - system/bluetooth/data/network.conf:system/etc/bluetooth/network.conf \ frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/target/product/mini.mk b/target/product/mini.mk index 38d912f..76d4511 100644 --- a/target/product/mini.mk +++ b/target/product/mini.mk @@ -66,7 +66,6 @@ PRODUCT_PACKAGES += \ abcc \ apache-xml \ audio \ - bluetoothd \ bouncycastle \ bu \ cacerts \ @@ -84,7 +83,6 @@ PRODUCT_PACKAGES += \ dx \ ext \ framework-res \ - hciattach \ hprof-conv \ icu.dat \ installd \ @@ -191,11 +189,6 @@ PRODUCT_PACKAGES += \ local_time.default PRODUCT_COPY_FILES += \ - system/bluetooth/data/audio.conf:system/etc/bluetooth/audio.conf \ - system/bluetooth/data/auto_pairing.conf:system/etc/bluetooth/auto_pairing.conf \ - system/bluetooth/data/blacklist.conf:system/etc/bluetooth/blacklist.conf \ - system/bluetooth/data/input.conf:system/etc/bluetooth/input.conf \ - system/bluetooth/data/network.conf:system/etc/bluetooth/network.conf \ frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf PRODUCT_PROPERTY_OVERRIDES += \ |