rockchip: refactor for bluetooth (btlinux) support

Signed-off-by: hmz007 <hmz007@gmail.com>

device/friendlyelec/nanopi3/aosp_nanopi3.mk

@@ -24,6 +24,8 @@ PRODUCT_BRAND ?= Android
 PRODUCT_MODEL ?= FriendlyELEC RK3588
 PRODUCT_MANUFACTURER ?= FriendlyELEC (www.friendlyelec.com)
 
+include device/friendlyelec/nanopi3/bluetooth.mk
+
 # for testing only
 ifeq ($(INSTALL_GAPPS_FOR_TESTING), yes)
 

device/friendlyelec/nanopi3/bluetooth.mk

@@ -0,0 +1,32 @@
+#
+# Copyright 2014 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Bluetooth HAL
+ifeq ($(TARGET_USE_BTLINUX_HAL_IMPL),true)
+DEVICE_MANIFEST_FILE += device/friendlyelec/nanopi3/manifest_bluetooth.xml
+
+PRODUCT_PACKAGES += \
+    android.hardware.bluetooth@1.0-impl \
+    android.hardware.bluetooth@1.1-service.btlinux
+
+PRODUCT_PACKAGES += \
+    libaptX_encoder \
+    libaptXHD_encoder \
+    libldacBT_enc \
+    libldacBT_abr
+
+PRODUCT_PACKAGES += android.hardware.bluetooth.audio@2.0-impl
+endif

device/friendlyelec/nanopi3/manifest_bluetooth.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2021, The Android Open Source Project.
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.bluetooth</name>
+        <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IBluetoothHci</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>

device/rockchip/common/device.mk

@@ -669,6 +669,10 @@ PRODUCT_COPY_FILES += \
 endif
 
 # Bluetooth HAL
+ifneq ($(TARGET_USE_BTLINUX_HAL_IMPL),true)
+DEVICE_MANIFEST_FILE += \
+    device/rockchip/common/manifests/android.hardware.bluetooth@1.0-service.xml
+
 PRODUCT_PACKAGES += \
     libbt-vendor \
     android.hardware.bluetooth@1.0-impl \
@@ -678,6 +682,7 @@ PRODUCT_PACKAGES += \
 ifeq ($(strip $(BOARD_HAVE_BLUETOOTH_RTK)), true)
 include hardware/realtek/rtkbt/rtkbt.mk
 endif
+endif
 
 ifeq ($(strip $(TARGET_BOARD_PLATFORM_PRODUCT)), box)
 #include device/rockchip/common/samba/rk31_samba.mk

device/rockchip/common/manifests/android.hardware.bluetooth@1.0-service.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2021, The Android Open Source Project.
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.bluetooth</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IBluetoothHci</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>

device/rockchip/common/manifests/manifest_level_31.xml

@@ -17,15 +17,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.bluetooth</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IBluetoothHci</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>

device/rockchip/common/wifi_bt_common.mk

@@ -54,7 +54,7 @@ WIFI_DRIVER_FW_PATH_STA     := "/vendor/etc/firmware/fw_bcm4329.bin"
 WIFI_DRIVER_FW_PATH_P2P     := "/vendor/etc/firmware/fw_bcm4329_p2p.bin"
 WIFI_DRIVER_FW_PATH_AP      := "/vendor/etc/firmware/fw_bcm4329_apsta.bin"
 BOARD_HAVE_BLUETOOTH := true
-BOARD_HAVE_BLUETOOTH_BCM := true
+BOARD_HAVE_BLUETOOTH_BCM ?= true
-BOARD_HAVE_BLUETOOTH_RTK := true
+BOARD_HAVE_BLUETOOTH_RTK ?= true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR ?= device/rockchip/$(TARGET_BOARD_PLATFORM)/bluetooth
 endif