Ensure usb related .rc is parsed in a defined order

Loading process (e.g. taimen):
- rootdir/init.rc
    |- /vendor/etc/init/hw/init.taimen.rc
        |- /vendor/etc/init/hw/init.taimen.usb.rc
	    |- /vendor/etc/init/hw/init.wahoo.usb.rc

This CL moves the init.taimen.usb.rc to /vendor/etc/init/hw, and
imports init.wahoo.usb.rc from init.taimen.usb.rc.

Test: Build with related CLs and USB File Transfer works on taimen
Bug: 38301110
Change-Id: I00ba96c1ebb5c17dfd3a8ca59024c2f6b81ef409
Signed-off-by: Yueyao Zhu <yueyao@google.com>
This commit is contained in:
Yueyao Zhu
2017-05-18 14:11:22 -07:00
parent 1dd23ec0b9
commit bb0bb1c62a
2 changed files with 2 additions and 7 deletions

View File

@@ -32,7 +32,7 @@ include device/google/wahoo/device.mk
PRODUCT_COPY_FILES += \
device/google/taimen/init-taimen.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init-$(PRODUCT_HARDWARE).rc \
device/google/taimen/init.taimen.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_HARDWARE).usb.rc
device/google/taimen/init.taimen.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_HARDWARE).usb.rc
PRODUCT_PROPERTY_OVERRIDES += \
ro.sf.lcd_density=560 \

View File

@@ -1,6 +1 @@
#
# The following import has been moved to /vendor/etc/init and will be
# loaded by /init automatically, so is commented out to reduce the
# noise in the log (and avoid redundancy).
#
#import init.wahoo.usb.rc
import /vendor/etc/init/hw/init.wahoo.usb.rc