From 6ca34f1bf5d6541f76a70aaa790297b58b45bfef Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 27 Feb 2017 08:58:08 -0800 Subject: [PATCH] Bluetooth: move to vendor partition. Bug: 35328775 Test: works in both binderized and passthrough modes Merged-In: I18f21b53c2282e27342a58716475ae213a2837d4 Change-Id: I18f21b53c2282e27342a58716475ae213a2837d4 --- CleanSpec.mk | 4 ++++ bluetooth/1.0/default/Android.bp | 1 + bluetooth/1.0/default/Android.mk | 1 + .../1.0/default/android.hardware.bluetooth@1.0-service.rc | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 962f6cd67e..212c8b1bf7 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -48,3 +48,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.hardware*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/android.hardware*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/android.hardware*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.hardware.bluetooth*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/android.hardware.bluetooth*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/android.hardware.bluetooth*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware.bluetooth*) diff --git a/bluetooth/1.0/default/Android.bp b/bluetooth/1.0/default/Android.bp index 2ae262c273..fb20195c0e 100644 --- a/bluetooth/1.0/default/Android.bp +++ b/bluetooth/1.0/default/Android.bp @@ -15,6 +15,7 @@ cc_library_shared { name: "android.hardware.bluetooth@1.0-impl", + proprietary: true, relative_install_path: "hw", srcs: [ "bluetooth_hci.cc", diff --git a/bluetooth/1.0/default/Android.mk b/bluetooth/1.0/default/Android.mk index 5043fb9e11..7530925674 100644 --- a/bluetooth/1.0/default/Android.mk +++ b/bluetooth/1.0/default/Android.mk @@ -17,6 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE := android.hardware.bluetooth@1.0-service LOCAL_INIT_RC := android.hardware.bluetooth@1.0-service.rc LOCAL_SRC_FILES := \ diff --git a/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc b/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc index 8c5c02a15d..8545d2f613 100644 --- a/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc +++ b/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc @@ -1,4 +1,4 @@ -service bluetooth-1-0 /system/bin/hw/android.hardware.bluetooth@1.0-service +service bluetooth-1-0 /vendor/bin/hw/android.hardware.bluetooth@1.0-service class hal user bluetooth group bluetooth