summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kiryanov <rkir@google.com>2023-04-12 16:53:37 +0000
committerPresubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com>2023-04-12 16:53:37 +0000
commita72664d482ac32bfc9d59f7307d26409148e4133 (patch)
tree837c8a0d026174b32b7ecd8d06755f88261d7561
parentd9cc15900ba153b05fce226b6cf20113b37e9fc2 (diff)
parent9b0fc837146ec51d33e78f545574294f8f6ce940 (diff)
downloadcar-a72664d482ac32bfc9d59f7307d26409148e4133.tar.gz
[automerge] Do not override goldfish kernel 2p: 9b0fc83714
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/car/+/22597894 Bug: 277230251 Change-Id: I8a3b067f12565c473e63de16c9a99d9ab7b26014
-rw-r--r--emulator/usbpt/bluetooth/btusb/BoardConfig.mk5
-rw-r--r--emulator/usbpt/wifi/BoardConfig.mk12
2 files changed, 0 insertions, 17 deletions
diff --git a/emulator/usbpt/bluetooth/btusb/BoardConfig.mk b/emulator/usbpt/bluetooth/btusb/BoardConfig.mk
index c37e7d0..2a13328 100644
--- a/emulator/usbpt/bluetooth/btusb/BoardConfig.mk
+++ b/emulator/usbpt/bluetooth/btusb/BoardConfig.mk
@@ -12,8 +12,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-TARGET_KERNEL_USE ?= 5.15
-
-BOARD_VENDOR_KERNEL_MODULES += \
- $(KERNEL_MODULES_PATH)/btusb.ko
diff --git a/emulator/usbpt/wifi/BoardConfig.mk b/emulator/usbpt/wifi/BoardConfig.mk
index ae96593..2a13328 100644
--- a/emulator/usbpt/wifi/BoardConfig.mk
+++ b/emulator/usbpt/wifi/BoardConfig.mk
@@ -12,15 +12,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-TARGET_KERNEL_USE ?= 5.15
-
-BOARD_VENDOR_KERNEL_MODULES += \
- $(KERNEL_MODULES_PATH)/mt76x2u.ko \
- $(KERNEL_MODULES_PATH)/mt76x2-common.ko \
- $(KERNEL_MODULES_PATH)/mt76x0u.ko \
- $(KERNEL_MODULES_PATH)/mt76x0-common.ko \
- $(KERNEL_MODULES_PATH)/mt76x02-usb.ko \
- $(KERNEL_MODULES_PATH)/mt76x02-lib.ko \
- $(KERNEL_MODULES_PATH)/mt76-usb.ko \
- $(KERNEL_MODULES_PATH)/mt76.ko