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 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rootdir/Android.mk') 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) -- cgit v1.2.3 From 138360c7d1b7e6004daab82a93b1b5b84d8cad10 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Wed, 31 Jan 2018 12:47:59 +0100 Subject: msm8996-common: Move fstab to /vendor Change-Id: I2e86c3be08d0d4f19a6cf89a931f4a1e6ac12cdf --- rootdir/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rootdir/Android.mk') diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 9324fcb..eb67fd2 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -7,7 +7,7 @@ LOCAL_MODULE := fstab.qcom LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/fstab.qcom -LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) include $(BUILD_PREBUILT) include $(CLEAR_VARS) -- cgit v1.2.3 From 166c635c2f8fa7b358ae5b276943fd97b1c80b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sun, 25 Feb 2018 20:01:41 +0100 Subject: msm8996-common: Use TARGET_OUT_VENDOR_EXECUTABLES for all qcom shell scripts --- rootdir/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rootdir/Android.mk') diff --git a/rootdir/Android.mk b/rootdir/Android.mk index eb67fd2..bc0e71a 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -42,7 +42,7 @@ LOCAL_MODULE := init.qcom.usb.sh LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_SRC_FILES := etc/init.qcom.usb.sh -LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -50,7 +50,7 @@ LOCAL_MODULE := init.qcom.bt.sh LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_SRC_FILES := etc/init.qcom.bt.sh -LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) include $(BUILD_PREBUILT) include $(CLEAR_VARS) -- cgit v1.2.3 From 50ef3ca5113e38529cf5f3940a9b2121670cf75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sun, 25 Feb 2018 21:53:57 +0100 Subject: msm8996-common:: rootdir: Remove unneeded init.qcom.sensors.sh. --- rootdir/Android.mk | 8 -------- 1 file changed, 8 deletions(-) (limited to 'rootdir/Android.mk') diff --git a/rootdir/Android.mk b/rootdir/Android.mk index bc0e71a..6c3df51 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -62,14 +62,6 @@ LOCAL_SRC_FILES := etc/ueventd.qcom.rc LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR) include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := init.qcom.sensors.sh -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.qcom.sensors.sh -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := chargeonlymode LOCAL_MODULE_OWNER := zuk -- cgit v1.2.3