Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99355407 authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by Android (Google) Code Review
Browse files

Merge "Migrate IUsb implementation to AIDL"

parents e86cb214 c0136b81
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -130,8 +130,11 @@ ifeq ($(wildcard vendor/google_devices/redfin/proprietary/device-vendor-redfin.m
    BUILD_WITHOUT_VENDOR := true
endif

# USB HAL
PRODUCT_PACKAGES += \
    android.hardware.usb@1.3-service.redfin
    android.hardware.usb-service.redfin
PRODUCT_PACKAGES += \
    android.hardware.usb.gadget-service.redfin

# Vibrator HAL
PRODUCT_PACKAGES += \
+4 −9
Original line number Diff line number Diff line
//
// Copyright (C) 2018 The Android Open Source Project
// 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.
@@ -18,19 +18,14 @@ package {
}

cc_binary {
    name: "android.hardware.usb@1.3-service.redfin",
    name: "android.hardware.usb.gadget-service.redfin",
    relative_install_path: "hw",
    init_rc: ["android.hardware.usb@1.3-service.redfin.rc"],
    init_rc: ["android.hardware.usb.gadget-service.redfin.rc"],
    vintf_fragments: [
        "android.hardware.usb@1.3-service.redfin.xml",
        "android.hardware.usb.gadget@1.1-service.redfin.xml",
    ],
    srcs: ["service.cpp", "Usb.cpp", "UsbGadget.cpp"],
    srcs: ["service_gadget.cpp", "UsbGadget.cpp"],
    shared_libs: [
        "android.hardware.usb@1.0",
        "android.hardware.usb@1.1",
        "android.hardware.usb@1.2",
        "android.hardware.usb@1.3",
        "android.hardware.usb.gadget@1.0",
        "android.hardware.usb.gadget@1.1",
        "libbase",
+0 −0

File moved.

+0 −0

File moved.

+1 −1
Original line number Diff line number Diff line
service vendor.usb-hal-1-3 /vendor/bin/hw/android.hardware.usb@1.3-service.redfin
service vendor.usb-gadget-hal-1-1 /vendor/bin/hw/android.hardware.usb.gadget-service.redfin
    class hal
    user system
    group system shell mtp
Loading