msm8226-common: Move hardware specific .rc files to /vendor/etc/init/hw

The reason these files are moved to /vendor/etc/init/hw and
not /vendor/etc/init is because 'init' scans the /vendor/etc/init folder
for vendor service .rc fragments to import. That would either result
in duplicate imports or out-of-order imports of these hardware
specific .rc files and that *may* have unintended consequences.

In order to preserve the current import order for MTP, we move all
hardware specific .rc files to /vendor/etc/init/hw which is not
autoscanned by init BUT leave the init.${ro.hardware}.rc (i.e.
init.qcom.rc in this case) in root for 'init' to find.

Signed-off-by: Joshua Primero <jprimero155@gmail.com>
This commit is contained in:
RomanDesigner 2020-01-05 12:56:38 +03:00
parent 802f5e740f
commit 58de415064
No known key found for this signature in database
GPG key ID: 6757965E5D54CB61
2 changed files with 6 additions and 6 deletions

View file

@ -7,7 +7,7 @@ LOCAL_MODULE := init.qcom.rc
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.qcom.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@ -15,7 +15,7 @@ LOCAL_MODULE := init.qcom.usb.rc
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.qcom.usb.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw
include $(BUILD_PREBUILT)
# Copy the power config for recovery too
@ -40,7 +40,7 @@ LOCAL_MODULE := init.qcom.power.rc
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.qcom.power.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw
include $(BUILD_PREBUILT)
# Configuration scripts

View file

@ -25,9 +25,9 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
import init.qcom.power.rc
import init.qcom.usb.rc
import init.target.rc
import /system/vendor/etc/init/hw/init.qcom.power.rc
import /system/vendor/etc/init/hw/init.qcom.usb.rc
import /system/vendor/etc/init/hw/init.target.rc
on early-init
mount debugfs debugfs /sys/kernel/debug