From d13d34e93e1681b35f22a3b400b0ae381e7f7a21 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sun, 15 Sep 2024 08:14:59 +0100 Subject: [PATCH] sm8550-common: usb_compositions: Move config to odm USB gadget HAL supports loading compositions from vendor, odm and product partitions. Move the config to odm partition since it has been modified and is now entirely device-specific and moreover not to have a conflicting build copy rule. Change-Id: Ibe1a62021af2fa2127c1361855451dc8dc67fe1f --- common.mk | 2 +- configs/usb/usb_compositions.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.mk b/common.mk index 32714bb..208957d 100644 --- a/common.mk +++ b/common.mk @@ -316,7 +316,7 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/usb/etc PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/usb/usb_compositions.conf:$(TARGET_COPY_OUT_VENDOR)/etc/usb_compositions.conf + $(LOCAL_PATH)/configs/usb/usb_compositions.conf:$(TARGET_COPY_OUT_ODM)/etc/usb_compositions.conf PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \ diff --git a/configs/usb/usb_compositions.conf b/configs/usb/usb_compositions.conf index c8ae921..1e3a72a 100644 --- a/configs/usb/usb_compositions.conf +++ b/configs/usb/usb_compositions.conf @@ -1,4 +1,4 @@ -# /vendor/etc/usb_compositions.conf: HSUSB VID PID supported compositions +# /odm/etc/usb_compositions.conf: HSUSB VID PID supported compositions # # This file lists the vendor supported vid-pid compositions for HSUSB that are # referenced in UsbGadget.cpp. Use the specified format below for compositions,