mirror of
https://github.com/Evolution-X-Devices/device_google_walleye
synced 2026-01-27 15:51:28 +00:00
Move configuration files to vendor for build split
The following configuration files need to reside in vendor partition to work with generic AOSP system image. Move uevent.*.rc to /vendor Move fstab.* to /vendor/etc Move init.*.rc and init.wahoo.usb.rc to /vendor/etc/init. Also the following two make file variables need to be set: - BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true - PRODUCT_ENFORCE_RRO_TARGETS := framework-res Comment out "import init.wahoo.usb.sh" in init.common.usb.rc since /init will load all rc files under /vendor/etc/init. Bug: 37927875 Test: These files are under /vendor instead of / or /system, path in init.common.usb.rc is changed to vendor accordingly, and the resulted system/vendor images work on the device. Change-Id: I63e18860eed9330e0d7b53b3df09483f2bfce5ea
This commit is contained in:
@@ -49,3 +49,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor)
|
||||
|
||||
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/muskie/vendor/etc/sensors/sensor_def_qcomdev.conf)
|
||||
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/walleye/vendor/etc/sensors/sensor_def_qcomdev.conf)
|
||||
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.$(PRODUCT_HARDWARE).logging.rc)
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.$(PRODUCT_HARDWARE).usb.rc)
|
||||
|
||||
@@ -36,15 +36,15 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.radio.log_loc="/data/vendor/modem_dump"
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/init.logging.userdebug.rc:root/init.$(PRODUCT_HARDWARE).logging.rc
|
||||
$(LOCAL_PATH)/init.logging.userdebug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_HARDWARE).logging.rc
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/init.logging.rc:root/init.$(PRODUCT_HARDWARE).logging.rc
|
||||
$(LOCAL_PATH)/init.logging.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_HARDWARE).logging.rc
|
||||
endif
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/init-common.rc:vendor/etc/init/init-$(PRODUCT_HARDWARE).rc \
|
||||
$(LOCAL_PATH)/init.common.usb.rc:root/init.$(PRODUCT_HARDWARE).usb.rc \
|
||||
$(LOCAL_PATH)/init-common.rc:i$(TARGET_COPY_OUT_VENDOR)/etc/init/init-$(PRODUCT_HARDWARE).rc \
|
||||
$(LOCAL_PATH)/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_HARDWARE).usb.rc \
|
||||
$(LOCAL_PATH)/init.insmod.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg
|
||||
|
||||
include device/google/wahoo/device.mk
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
import init.wahoo.usb.rc
|
||||
#
|
||||
# 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
|
||||
|
||||
on boot && property:ro.bootmode=usbradio && property:persist.sys.usb.usbradio.config=*
|
||||
setprop sys.usb.config "none"
|
||||
|
||||
Reference in New Issue
Block a user