diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2017-11-17 00:33:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-17 00:33:58 +0000 |
| commit | 03a8437a426a017e574f8878ccb7a48736da26ec (patch) | |
| tree | f5be3cff58cf5d75398b2ad0d556e5531027a344 | |
| parent | e34269e916d686d296392860eda471dc67b20cea (diff) | |
| parent | dd133b894dfb8c2c06da17230229423a1df1c860 (diff) | |
| download | goldfish-oreo-vts-release.tar.gz | |
Merge "Snap for 4455664 from c2e4b09ac2d23a866ca389f7152e4e8cd07e9ff9 to oreo-vts-release" into oreo-vts-releaseandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10oreo-vts-release
| -rw-r--r-- | fstab.ranchu | 4 | ||||
| -rw-r--r-- | init.ranchu.rc | 4 | ||||
| -rw-r--r-- | manifest.xml | 18 |
3 files changed, 4 insertions, 22 deletions
diff --git a/fstab.ranchu b/fstab.ranchu index 31958e91..b9eb7546 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 9291c239..c9abe1df 100644 --- a/init.ranchu.rc +++ b/init.ranchu.rc @@ -71,13 +71,13 @@ on property:qemu.adbd=start 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 e4adfd68..7d359a0c 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> |