diff options
| author | Abhishek Arpure <aarpure@codeaurora.org> | 2017-05-19 08:32:12 -0700 |
|---|---|---|
| committer | Arian <arian.kulmer@web.de> | 2019-10-25 22:16:14 +0200 |
| commit | c604d50a5d882050a6ccfe82ad5605310ebd4700 (patch) | |
| tree | 993259ae16809217dd99ebcbf3edb73b507fd8ab | |
| parent | ed4f7224d89186cabc9f9e4b9f8f4b382261a8d8 (diff) | |
shinano-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
| -rw-r--r-- | rootdir/Android.mk | 12 | ||||
| -rw-r--r-- | rootdir/etc/init.qcom.rc | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 7dddd88..cf34945 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -13,7 +13,7 @@ LOCAL_MODULE := init.camera.rc LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.camera.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -21,7 +21,7 @@ LOCAL_MODULE := init.platform-common.rc LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.platform-common.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -29,7 +29,7 @@ LOCAL_MODULE := init.qcom.power.rc LOCAL_MODULE_TAGS := optional eng 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) include $(CLEAR_VARS) @@ -37,7 +37,7 @@ LOCAL_MODULE := init.qcom.rc LOCAL_MODULE_TAGS := optional eng 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) @@ -53,7 +53,7 @@ LOCAL_MODULE := init.sony.rc LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.sony.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -61,7 +61,7 @@ LOCAL_MODULE := init.sony.usb.rc LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.sony.usb.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +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 fe6f3f6..1431a47 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -15,11 +15,11 @@ # limitations under the License. # -import /init.qcom.power.rc -import /init.sony.rc -import /init.sony.usb.rc -import /init.platform-common.rc -import /init.camera.rc +import /vendor/etc/init/hw/init.qcom.power.rc +import /vendor/etc/init/hw/init.sony.rc +import /vendor/etc/init/hw/init.sony.usb.rc +import /vendor/etc/init/hw/init.platform-common.rc +import /vendor/etc/init/hw/init.camera.rc on early-init mount debugfs /sys/kernel/debug /sys/kernel/debug mode=755 |