sdm845-common: init.qcom.usb.rc: Consolidate init.msm.usb.configfs.rc

Remove obsolete android_usb based property triggers now
that configfs is always used. Merge in init.msm.configfs.rc
so we now have just a single .rc init file.

Also remove all other references to /sys/class/android_usb/*.

Change-Id: I06eba8e715ccee5974dc9de8ac19df6c79ae0c45

rootdir/Android.mk

@@ -56,14 +56,6 @@ LOCAL_SRC_FILES    := etc/init.qcom.usb.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE       := init.msm.usb.configfs.rc
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/init.msm.usb.configfs.rc
-LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE       := init.qcom.usb.sh
 LOCAL_MODULE_TAGS  := optional

rootdir/etc/init.qcom.rc

@@ -29,7 +29,6 @@
 
 import /vendor/etc/init/hw/init.qcom.power.rc
 import /vendor/etc/init/hw/init.qcom.usb.rc
-import /vendor/etc/init/hw/init.msm.usb.configfs.rc
 import /vendor/etc/init/hw/init.target.rc
 
 on early-init

rootdir/etc/init.qcom.usb.sh

@@ -36,10 +36,6 @@
 #
 esoc_name=`cat /sys/bus/esoc/devices/esoc0/esoc_name 2> /dev/null`
 
-if [ -f /sys/class/android_usb/f_mass_storage/lun/nofua ]; then
-    echo 1  > /sys/class/android_usb/f_mass_storage/lun/nofua
-fi
-
 # Clear vendor USB config because it is only needed for debugging
 setprop persist.vendor.usb.config ""
 

sdm845.mk

@@ -121,7 +121,6 @@ PRODUCT_PACKAGES += \
 
 # Common init scripts
 PRODUCT_PACKAGES += \
-    init.msm.usb.configfs.rc \
     init.qcom.early_boot.sh \
     init.qcom.post_boot.sh \
     init.qcom.rc \