diff options
| author | Roman Kiryanov <rkir@google.com> | 2020-05-15 18:11:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-15 18:11:00 +0000 |
| commit | 8adc6eb0dfcb672b5da1ec523c03fa4cf4a2c68c (patch) | |
| tree | 76822adbcda2a0ff6ca8fd4daffe8cbea3698892 | |
| parent | f2e1e72b67eac3ab59d2bb34bf6072a11660d0c5 (diff) | |
| parent | 3ae7a2c9f67876c71a6e5ae4db750cedf6787f3e (diff) | |
| download | device_generic_trusty-8adc6eb0dfcb672b5da1ec523c03fa4cf4a2c68c.tar.gz device_generic_trusty-8adc6eb0dfcb672b5da1ec523c03fa4cf4a2c68c.tar.bz2 device_generic_trusty-8adc6eb0dfcb672b5da1ec523c03fa4cf4a2c68c.zip | |
Copy advancedFeatures.ini and fstab.ranchu from qemu am: 3ae7a2c9f6
Change-Id: I315ad7827d41762a0d53c55a8768ee8038411a93
| -rw-r--r-- | advancedFeatures.ini | 6 | ||||
| -rw-r--r-- | fstab.ranchu | 6 | ||||
| -rw-r--r-- | qemu_trusty_base.mk | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/advancedFeatures.ini b/advancedFeatures.ini new file mode 100644 index 0000000..29c1cf7 --- /dev/null +++ b/advancedFeatures.ini @@ -0,0 +1,6 @@ +GrallocSync = on +LogcatPipe = on +GLAsyncSwap = on +GLESDynamicVersion = on +GLDMA = on +SystemAsRoot = on diff --git a/fstab.ranchu b/fstab.ranchu new file mode 100644 index 0000000..3eed0be --- /dev/null +++ b/fstab.ranchu @@ -0,0 +1,6 @@ +# Android fstab file. +#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> +# The filesystem that contains the filesystem checker binary (typically /system) cannot +# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK +/dev/block/vdc /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check +/devices/*/block/vde auto auto defaults voldmanaged=sdcard:auto,encryptable=userdata diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk index 4d50f31..c97abc3 100644 --- a/qemu_trusty_base.mk +++ b/qemu_trusty_base.mk @@ -84,13 +84,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_FULL_TREBLE_OVERRIDE := true PRODUCT_COPY_FILES += \ - device/generic/qemu/fstab.ranchu:root/fstab.qemu_trusty \ + device/generic/trusty/fstab.ranchu:root/fstab.qemu_trusty \ device/generic/trusty/init.qemu_trusty.rc:root/init.qemu_trusty.rc \ device/generic/trusty/ueventd.qemu_trusty.rc:root/ueventd.qemu_trusty.rc \ PRODUCT_COPY_FILES += \ device/generic/goldfish/data/etc/config.ini:config.ini \ - device/generic/qemu/advancedFeatures.ini:advancedFeatures.ini \ + device/generic/trusty/advancedFeatures.ini:advancedFeatures.ini \ # for Trusty $(call inherit-product, system/core/trusty/trusty-base.mk) |