diff options
author | Roman Kiryanov <rkir@google.com> | 2023-04-13 03:01:45 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-13 03:01:45 +0000 |
commit | c20c557fe0ef5783e30d26503c07b8b915513e4a (patch) | |
tree | 38ff7ccf0a9d09cbcb3da0ee778f27910e3ea78d | |
parent | 7b16fe589dcb0aaec854d590c09ab0e8d817418a (diff) | |
parent | a72664d482ac32bfc9d59f7307d26409148e4133 (diff) | |
download | car-c20c557fe0ef5783e30d26503c07b8b915513e4a.tar.gz |
[automerge] Do not override goldfish kernel 2p: 9b0fc83714 am: a72664d482
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/car/+/22597894
Change-Id: I86e54f639c1ec3fb6c918aa8c6b3c2f6b13932d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | emulator/usbpt/bluetooth/btusb/BoardConfig.mk | 5 | ||||
-rw-r--r-- | emulator/usbpt/wifi/BoardConfig.mk | 12 |
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 |