am 0ed78ec7
: am d81b9d22
: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
* commit '0ed78ec7c4b659a1b6b0bd5e39428f882411a0ff': ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
This commit is contained in:
commit
adeea83673
4 changed files with 0 additions and 27 deletions
|
@ -25,12 +25,9 @@ GRANDFATHERED_ALL_PREBUILT := \
|
|||
akmd2 \
|
||||
am \
|
||||
ap_gain.bin \
|
||||
audio.conf \
|
||||
auto_pairing.conf \
|
||||
AVRCP.kl \
|
||||
batch \
|
||||
bitmap_size.txt \
|
||||
blacklist.conf \
|
||||
bmgr \
|
||||
bp.img \
|
||||
brcm_guci_drv \
|
||||
|
@ -61,7 +58,6 @@ GRANDFATHERED_ALL_PREBUILT := \
|
|||
init.sholes.rc \
|
||||
init.stingray.rc \
|
||||
input \
|
||||
input.conf \
|
||||
kernel \
|
||||
lbl \
|
||||
libEGL_POWERVR_SGX530_121.so \
|
||||
|
@ -80,7 +76,6 @@ GRANDFATHERED_ALL_PREBUILT := \
|
|||
mbm_consumer.bin \
|
||||
mdm_panicd \
|
||||
monkey \
|
||||
network.conf \
|
||||
pm \
|
||||
pppd-ril \
|
||||
pppd-ril.options \
|
||||
|
|
|
@ -27,9 +27,6 @@
|
|||
# A mapping from shorthand names to include directories.
|
||||
#
|
||||
pathmap_INCL := \
|
||||
bluedroid:system/bluetooth/bluedroid/include \
|
||||
bluez:external/bluetooth/bluez \
|
||||
glib:external/bluetooth/glib \
|
||||
bootloader:bootable/bootloader/legacy/include \
|
||||
camera:system/media/camera/include \
|
||||
corecg:external/skia/include/core \
|
||||
|
|
|
@ -48,14 +48,7 @@ PRODUCT_PACKAGES := \
|
|||
|
||||
PRODUCT_PACKAGES += \
|
||||
audio \
|
||||
bluetoothd \
|
||||
brcm_patchram_plus \
|
||||
dhcpcd.conf \
|
||||
hciattach \
|
||||
libbluedroid \
|
||||
libbluetooth \
|
||||
libbluetoothd \
|
||||
libglib \
|
||||
network \
|
||||
pand \
|
||||
pppd \
|
||||
|
@ -83,11 +76,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 += \
|
||||
|
|
|
@ -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 += \
|
||||
|
|
Loading…
Reference in a new issue