Merge "Snap for 4455664 from c2e4b09ac2d23a866ca389f7152e4e8cd07e9ff9 to oreo-vts-release" into oreo-vts-release
diff --git a/fstab.ranchu b/fstab.ranchu
index 31958e9..b9eb754 100644
--- a/fstab.ranchu
+++ b/fstab.ranchu
@@ -4,5 +4,5 @@
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
/dev/block/vda /system ext4 ro wait
/dev/block/vdb /cache ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait
-/dev/block/vdc /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check,quota
-/devices/*/block/vdd auto auto defaults voldmanaged=sdcard:auto,encryptable=userdata
+/dev/block/vdc /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check,quota,forceencrypt=/dev/block/vdd
+/devices/*/block/vde auto auto defaults voldmanaged=sdcard:auto,encryptable=userdata
diff --git a/init.ranchu.rc b/init.ranchu.rc
index 9291c23..c9abe1d 100644
--- a/init.ranchu.rc
+++ b/init.ranchu.rc
@@ -71,13 +71,13 @@
chown root system /sys/power/wake_lock
chown root system /sys/power/wake_unlock
-service ranchu-setup /vendor/bin/init.ranchu-core.sh
+service ranchu-setup /system/bin/init.ranchu-core.sh
class core
user root
group root
oneshot
-service ranchu-net /vendor/bin/init.ranchu-net.sh
+service ranchu-net /system/bin/init.ranchu-net.sh
class late_start
user root
group root wakelock
diff --git a/manifest.xml b/manifest.xml
index e4adfd6..7d359a0 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -15,24 +15,6 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.graphics.mapper</name>
- <transport arch="32+64">passthrough</transport>
- <version>2.0</version>
- <interface>
- <name>IMapper</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.configstore</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>ISurfaceFlingerConfigs</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.graphics.allocator</name>
<transport>hwbinder</transport>
<version>2.0</version>
