From 049f9acfa5d8c7795d7cac307b665def473cb693 Mon Sep 17 00:00:00 2001
From: PythonLimited <leonardomeitz@gmail.com>
Date: Mon, 22 Jul 2019 00:53:50 +0200
Subject: [PATCH] update stuff to new vendor

---
 BoardConfigCommon.mk |  3 ---
 msm8226.mk           |  3 ---
 rootdir/init.qcom.rc | 23 +++++++++++------------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 9d64acd..deec27d 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -25,6 +25,3 @@ TARGET_SYSTEM_PROP := device/samsung/msm8226-common/system.prop
 
 # SELinux
 include device/samsung/msm8226-common/sepolicy/sepolicy.mk
-
-# Inherit from the proprietary version
--include vendor/samsung/msm8226-common/BoardConfigVendor.mk
diff --git a/msm8226.mk b/msm8226.mk
index 0eb4738..37d9393 100644
--- a/msm8226.mk
+++ b/msm8226.mk
@@ -207,9 +207,6 @@ PRODUCT_PACKAGES += \
     libcurl \
     libwcnss_qmi \
     wcnss_service
-    
-# Get non-open-source specific aspects
-$(call inherit-product-if-exists, vendor/samsung/msm8226-common/msm8226-common-vendor.mk)
 
 # Inherit from qcom-common
 $(call inherit-product, device/samsung/qcom-common/qcom-common.mk)
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index 0582c61..4fc1262 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -573,7 +573,7 @@ on charger
 
 # Services begin here
 
-service adsprpcd /vendor/bin/adsprpcd
+service adsprpcd /system/bin/adsprpcd
     class main
     user media
     group media
@@ -588,7 +588,7 @@ service charger /sbin/healthd -c
     critical
     seclabel u:r:charger:s0
 
-service ds_fmc_appd /vendor/bin/ds_fmc_appd -p "rmnet0" -D
+service ds_fmc_appd /system/bin/ds_fmc_appd -p "rmnet0" -D
     class late_start
     user root
     group radio wifi inet
@@ -611,38 +611,37 @@ on property:bluetooth.hciattach=true
 on property:bluetooth.hciattach=false
     setprop bluetooth.status off
 
-service irsc_util /vendor/bin/irsc_util "/vendor/etc/sec_config"
+service irsc_util /system/bin/irsc_util "/vendor/etc/sec_config"
     class main
     user root
     oneshot
 
-service mpdecision /vendor/bin/mpdecision --avg_comp
+service mpdecision /system/bin/mpdecision --avg_comp
     class main
     user root
     group root readproc
-    disabled
 
-service qcamerasvr /vendor/bin/mm-qcamera-daemon
+service qcamerasvr /system/bin/mm-qcamera-daemon
     class main
     user camera
     group camera system inet input graphics bluetooth
 
-service qmuxd /vendor/bin/qmuxd
+service qmuxd /system/bin/qmuxd
     class core
     user radio
     group radio audio bluetooth gps oem_2950 log
 
-service qseecomd /vendor/bin/qseecomd
+service qseecomd /system/bin/qseecomd
     class core
     user root
     group root
 
-service rfs_access /vendor/bin/rfs_access
+service rfs_access /system/bin/rfs_access
     class core
     user system
     group system net_raw
 
-service rmt_storage /vendor/bin/rmt_storage
+service rmt_storage /system/bin/rmt_storage
     class core
     user root
     group system wakelock
@@ -658,7 +657,7 @@ on property:persist.sys.ssr.restart_level=1
 on property:persist.sys.ssr.restart_level=3
     write /sys/module/subsystem_restart/parameters/restart_level 3
     
-service thermal-engine /vendor/bin/thermal-engine -c /vendor/etc/thermal-engine-8226.conf
+service thermal-engine /system/bin/thermal-engine -c /vendor/etc/thermal-engine-8226.conf
    class main
    user root
    socket thermal-send-client stream 0666 system system
@@ -666,7 +665,7 @@ service thermal-engine /vendor/bin/thermal-engine -c /vendor/etc/thermal-engine-
    socket thermal-recv-passive-client stream 0666 system system
    group root   
 
-service time_daemon /vendor/bin/time_daemon
+service time_daemon /system/bin/time_daemon
     class late_start
     user root
     group root