commit 0942768af1afc3f42384f60e3efc52f29662786e
author Jaikumar Ganesh <jaikumar@google.com> Tue May 05 22:27:45 2009 -0700
committer Jaikumar Ganesh <jaikumar@google.com> Tue Jun 09 17:20:47 2009 -0700
tree dfc041f853910a98ab9d00fe728c9eb3b3c5a276
parent d9f7a05830e48f42669df1fca0be03e279b12dc0

Bluez4 changes

Rename hcid to bluetoothd, modify include paths, add cleanspec

cleanspec.mk

diff --git a/cleanspec.mk b/cleanspec.mk
index a5011c6..a9ba5cb 100644
--- a/cleanspec.mk
+++ b/cleanspec.mk
@@ -84,6 +84,25 @@
 $(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/SHARED_LIBRARIES/lib?camera_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/STATIC_LIBRARIES/lib?camera_intermediates)
 
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/bluetooth/*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/host/common/obj/JAVA_LIBRARIES/layoutlib_intermediates/classes/android/bluetooth/*)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/obj/SHARED_LIBRARIES/libbluetooth_intermediates/*)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/obj/lib/libhcid.so)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/system/lib/libhcid.so)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/symbols/system/lib/libhcid.so)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/obj/EXECUTABLES/hcid_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/system/bin/hcid)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/symbols/system/bin/hcid)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/obj/EXECUTABLES/passkey-agent_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/system/xbin/passkey-agent)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/symbols/system/bin/passkey-agent)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/obj/EXECUTABLES/auth-agent_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/system/xbin/auth-agent)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/symbols/system/bin/auth-agent)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/obj/STATIC_LIBRARIES/libeglib_static_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/obj/STATIC_LIBRARIES/libgdbus_static_intermediates/*)
+$(call add-clean-step, rm -rf $(PRODUCT_DIR)/obj/STATIC_LIBRARIES/libbluez-utils-common-static_intermediates)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************

core/pathmap.mk

diff --git a/core/pathmap.mk b/core/pathmap.mk
index 2dd8f96..ad3980f 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -28,8 +28,8 @@
 #
 pathmap_INCL := \
     bluedroid:system/bluetooth/bluedroid/include \
-    bluez-libs:external/bluez/libs/include \
-    bluez-utils:external/bluez/utils \
+    bluez:external/bluetooth/bluez \
+    glib:external/bluetooth/glib \
     bootloader:bootable/bootloader/legacy/include \
     corecg:external/skia/include/core \
     dbus:external/dbus \

core/prelink-linux-arm.map

diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map
index e95268c..13d30e2 100644
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@ -27,7 +27,7 @@
 liba2dp.so              0xAEE00000
 audio.so                0xAED00000
 input.so                0xAEC00000
-libhcid.so              0xAEB00000
+libbluetoothd.so        0xAEB00000
 libbluedroid.so         0xAEA00000
 libbluetooth.so         0xAE900000
 libdbus.so              0xAE800000