From 15087283d31e09165caf099cd3e574e31ff640fb Mon Sep 17 00:00:00 2001 From: Abhishek Arpure Date: Fri, 19 May 2017 08:32:12 -0700 Subject: msm8996-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. Change-Id: I14531da05e2a3a256f734f8de96e1f1969c753f9 --- rootdir/Android.mk | 6 +++--- rootdir/etc/init.qcom.rc | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'rootdir') diff --git a/rootdir/Android.mk b/rootdir/Android.mk index bcdc60c..9324fcb 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -16,7 +16,7 @@ LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.qcom.power.rc LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := init/hw +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -25,7 +25,7 @@ LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.qcom.rc LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := init/hw +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -34,7 +34,7 @@ LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.qcom.usb.rc LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := init/hw +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index d193e33..e551463 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -26,6 +26,7 @@ # import /vendor/etc/init/hw/init.qcom.power.rc import /vendor/etc/init/hw/init.qcom.usb.rc +import /vendor/etc/init/hw/init.target.rc on early-init mount debugfs debugfs /sys/kernel/debug -- cgit v1.2.3