Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future
Bug: 347831320
Merged-In: Ibf7dda6c4c13d6513e2f08239c95c6b2778a98ec
Change-Id: Ic7c52e1a0b7db76af3857c67f502ba6de97a5825
diff --git a/OWNERS b/OWNERS
index 4a2962a..b471453 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,4 +2,4 @@
per-file powerhint.json = wvw@google.com,joaodias@google.com,jenhaochen@google.com,rkganesh@google.com,jychen@google.com
# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk=file:device/google/gs-common:main:/MK_OWNERS
+per-file *.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS
diff --git a/conf/OWNERS b/conf/OWNERS
new file mode 100644
index 0000000..20af85b
--- /dev/null
+++ b/conf/OWNERS
@@ -0,0 +1,2 @@
+# per-file for Pixel fstab
+per-file fstab.*=file:device/google/gs-common:main:/FSTAB_OWNERS
diff --git a/usb/gadget/UsbGadget.h b/usb/gadget/UsbGadget.h
index e483a91..ae9b786 100644
--- a/usb/gadget/UsbGadget.h
+++ b/usb/gadget/UsbGadget.h
@@ -74,7 +74,7 @@
constexpr char kProcIrqPath[] = "/proc/irq/";
constexpr char kSmpAffinityList[] = "/smp_affinity_list";
#ifndef UDC_PATH
-#define UDC_PATH "/sys/class/udc/11110000.dwc3/"
+#define UDC_PATH "/sys/devices/platform/11110000.usb/11110000.dwc3/udc/11110000.dwc3/"
#endif
static MonitorFfs monitorFfs(kGadgetName);