commit 1d2d8cae8016343980eabcbdd4bf77636321abce
author Jerry Zhang <zhangjerry@google.com> Wed Jan 04 10:30:32 2017 -0800
committer gitbuildkicker <android-build@google.com> Wed Jan 04 13:52:03 2017 -0800
tree 5da8b62904ec0898517a6892a5a21f66a73336f3
parent 37ec6d500af8e8d285ce2408e3aa350ca54496b0

Write aliases before ffs mount in recovery

This is necessary to support kernel changes
that allow for multiple ffs functions. Some
kernels require aliases in order to name
function instances before mount time.

Test: Reboot into recovery, verify adb works
Bug: 34070894
Change-Id: I8376304d92af9b3e8c734fdb8cc77f0dc8bc4850
(cherry picked from commit e66f861a7c71f0d59fabd8ec1d096485faf0901e)

etc/init.rc

diff --git a/etc/init.rc b/etc/init.rc
index faa7b2a..fa3689d 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -30,6 +30,7 @@
     write /proc/sys/vm/max_map_count 1000000
 
 on fs
+    write /sys/class/android_usb/android0/f_ffs/aliases adb
     mkdir /dev/usb-ffs 0770 shell shell
     mkdir /dev/usb-ffs/adb 0770 shell shell
     mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
@@ -37,7 +38,6 @@
     write /sys/class/android_usb/android0/enable 0
     write /sys/class/android_usb/android0/idVendor 18D1
     write /sys/class/android_usb/android0/idProduct D001
-    write /sys/class/android_usb/android0/f_ffs/aliases adb
     write /sys/class/android_usb/android0/functions adb
     write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
     write /sys/class/android_usb/android0/iProduct ${ro.product.model}