summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJi Soo Shin <jisshin@google.com>2022-04-26 23:46:53 +0200
committerJi Soo Shin <jisshin@google.com>2022-04-27 23:22:21 +0200
commit66f6551806384fbe51d1c12746372707148f38ed (patch)
treec576f7c683fb5e73636e6baa6c1bd76212b10a5b
parentaec270746582864d3e863505cbbe6dcc81cc51b0 (diff)
downloadcar-android12L-dev.tar.gz
usbpt: delete firmwares for dongleandroid12L-dev
Firmware must be provided by vendor. Bug: 215529815 Test: builds Change-Id: I600eabaf32979470004b775d4fa670d9bd5c2b87 Merged-in: I600eabaf32979470004b775d4fa670d9bd5c2b87 Merged-in: Iea88fef4736c8726c8bba655a0ebcf7a11264d17
-rw-r--r--emulator/btusb-passthrough/btusb.mk8
-rw-r--r--emulator/rtl_bt/Android.bp24
-rw-r--r--emulator/rtl_bt/rtl8821c_config.binbin10 -> 0 bytes
-rw-r--r--emulator/rtl_bt/rtl8821c_fw.binbin37356 -> 0 bytes
-rw-r--r--emulator/rtl_bt/rtl_bt.mk19
5 files changed, 4 insertions, 47 deletions
diff --git a/emulator/btusb-passthrough/btusb.mk b/emulator/btusb-passthrough/btusb.mk
index 7553e2f..8fc898d 100644
--- a/emulator/btusb-passthrough/btusb.mk
+++ b/emulator/btusb-passthrough/btusb.mk
@@ -15,8 +15,8 @@
# Enable Bluetooth passthrough support
$(call inherit-product, device/generic/car/emulator/bluetooth/btlinux-service.mk)
-# Add RTL BT dongle related packages
-$(call inherit-product, device/generic/car/emulator/rtl_bt/rtl_bt.mk)
-# Required for USB passthrough
+
+PRODUCT_PACKAGES += usb_modeswitch \
+
PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \ No newline at end of file
+ frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml
diff --git a/emulator/rtl_bt/Android.bp b/emulator/rtl_bt/Android.bp
deleted file mode 100644
index ade064e..0000000
--- a/emulator/rtl_bt/Android.bp
+++ /dev/null
@@ -1,24 +0,0 @@
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "device_generic_car_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["device_generic_car_license"],
-}
-
-prebuilt_firmware {
- name: "rtl8821c_fw.bin.car",
- src: "rtl8821c_fw.bin",
- sub_dir: "rtl_bt",
- filename_from_src: true,
- proprietary: true,
-}
-
-prebuilt_firmware {
- name: "rtl8821c_config.bin.car",
- src: "rtl8821c_config.bin",
- sub_dir: "rtl_bt",
- filename_from_src: true,
- proprietary: true,
-}
diff --git a/emulator/rtl_bt/rtl8821c_config.bin b/emulator/rtl_bt/rtl8821c_config.bin
deleted file mode 100644
index bb15fcd..0000000
--- a/emulator/rtl_bt/rtl8821c_config.bin
+++ /dev/null
Binary files differ
diff --git a/emulator/rtl_bt/rtl8821c_fw.bin b/emulator/rtl_bt/rtl8821c_fw.bin
deleted file mode 100644
index db7debd..0000000
--- a/emulator/rtl_bt/rtl8821c_fw.bin
+++ /dev/null
Binary files differ
diff --git a/emulator/rtl_bt/rtl_bt.mk b/emulator/rtl_bt/rtl_bt.mk
deleted file mode 100644
index 7f82414..0000000
--- a/emulator/rtl_bt/rtl_bt.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 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.
-
-# USB Passthru
-PRODUCT_PACKAGES += usb_modeswitch \
- rtl8821c_fw.bin.car \
- rtl8821c_config.bin.car