commit 88313cf20b653789160189eef263014b7036e264
author Ricky Niu <rickyniu@google.com> Wed Mar 31 15:54:30 2021 +0800
committer Saravana Kannan <saravanak@google.com> Fri Apr 02 04:42:53 2021 +0000
tree 1cc4e249b98788a15aeb3d97b399d38d623ad881
parent f2eb39f4d66f440177dd49b71d7da63ed722bb79

gs101: usb: remove flag "OLDER_GADGET"

The flag "OLDER_GADGET" is no need.
Using "11110000.dwc3" be the udc name.

Test: Build Pass and boot to home
Bug: 177879761
Signed-off-by: Ricky Niu <rickyniu@google.com>
Change-Id: I43c9e2815a6384c4dffdc47312fa0f372b34d9e9

usb/Android.bp

diff --git a/usb/Android.bp b/usb/Android.bp
index d6c0c72..ccaa001 100644
--- a/usb/Android.bp
+++ b/usb/Android.bp
@@ -24,20 +24,6 @@
     ],
 }
 
-soong_config_module_type_import {
-    from: "device/google/gs101/soong/Android.bp",
-    module_types: ["pixel_usbgadget_cc_defaults"],
-}
-
-pixel_usbgadget_cc_defaults {
-    name: "pixel_usbgadget",
-    soong_config_variables: {
-        older_gadget: {
-            cflags: ["-DOLDER_GADGET"],
-	},
-    },
-}
-
 cc_binary {
     name: "android.hardware.usb@1.3-service.gs101",
     relative_install_path: "hw",
@@ -48,7 +34,6 @@
     ],
     srcs: ["service.cpp", "Usb.cpp", "UsbGadget.cpp"],
     cflags: ["-Wall", "-Werror"],
-    defaults: ["pixel_usbgadget"],
     shared_libs: [
         "libbase",
         "libhidlbase",

usb/Usb.h

diff --git a/usb/Usb.h b/usb/Usb.h
index 930769c..69bf1ca 100644
--- a/usb/Usb.h
+++ b/usb/Usb.h
@@ -66,13 +66,8 @@
     V1_3
 };
 
-#ifdef OLDER_GADGET
 constexpr char kGadgetName[] = "11110000.dwc3";
 #define UDC_PATH "/sys/class/udc/11110000.dwc3/"
-#else
-constexpr char kGadgetName[] = "11110000.usb";
-#define UDC_PATH "/sys/class/udc/11110000.usb/"
-#endif
 
 #define ID_PATH UDC_PATH "device/id"
 #define VBUS_PATH UDC_PATH "device/b_sess"

usb/UsbGadget.h

diff --git a/usb/UsbGadget.h b/usb/UsbGadget.h
index 3cb3170..2669f8d 100644
--- a/usb/UsbGadget.h
+++ b/usb/UsbGadget.h
@@ -70,12 +70,9 @@
 using ::android::hardware::usb::gadget::V1_2::GadgetFunction;
 using ::std::string;
 
-#ifdef OLDER_GADGET
 constexpr char kGadgetName[] = "11110000.dwc3";
+#ifndef UDC_PATH
 #define UDC_PATH "/sys/class/udc/11110000.dwc3/"
-#else
-constexpr char kGadgetName[] = "11110000.usb";
-#define UDC_PATH "/sys/class/udc/11110000.usb/"
 #endif
 static MonitorFfs monitorFfs(kGadgetName);