diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-10 03:16:06 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-10 03:16:06 +0000 |
| commit | 2366b6106642efc6ce9fc855a41bfe13f8d3bdab (patch) | |
| tree | 64aef9bd1aa6aa3b2f116a138e1e330323008683 | |
| parent | 6fae6608e0ec6046bc70a5a0e359a4c9289f55bf (diff) | |
| parent | 1655dc7630fa7ed3df73b98c6324f82980f6384d (diff) | |
| download | android_device_generic_goldfish-2366b6106642efc6ce9fc855a41bfe13f8d3bdab.tar.gz android_device_generic_goldfish-2366b6106642efc6ce9fc855a41bfe13f8d3bdab.tar.bz2 android_device_generic_goldfish-2366b6106642efc6ce9fc855a41bfe13f8d3bdab.zip | |
Snap for 5452883 from 1655dc7630fa7ed3df73b98c6324f82980f6384d to qt-release
Change-Id: Iee5321201eff85e3009b1a7ff5e833e7a9d0bf04
| -rw-r--r-- | fstab.ranchu | 1 | ||||
| -rw-r--r-- | init.ranchu.rc | 16 | ||||
| -rw-r--r-- | sepolicy/common/file_contexts | 1 | ||||
| -rw-r--r-- | sepolicy/common/vendor_init.te | 2 | ||||
| -rw-r--r-- | vendor.mk | 2 |
5 files changed, 22 insertions, 0 deletions
diff --git a/fstab.ranchu b/fstab.ranchu index 9775677..4925334 100644 --- a/fstab.ranchu +++ b/fstab.ranchu @@ -4,3 +4,4 @@ # 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,quota,fileencryption=aes-256-xts:aes-256-cts,reservedsize=128M /devices/*/block/vdf auto auto defaults voldmanaged=sdcard:auto,encryptable=userdata +/dev/block/zram0 none swap defaults zramsize=75% diff --git a/init.ranchu.rc b/init.ranchu.rc index 992ed73..681565e 100644 --- a/init.ranchu.rc +++ b/init.ranchu.rc @@ -12,6 +12,9 @@ on init symlink /dev/goldfish_pipe /dev/android_pipe symlink /dev/goldfish_pipe /dev/qemu_pipe + write /sys/block/zram0/comp_algorithm lz4 + write /proc/sys/vm/page-cluster 0 + on post-fs-data setprop vold.post_fs_data_done 1 mkdir /data/vendor/var 0755 root root @@ -130,3 +133,16 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant -Dnl80211 -iwlan0 -c/vendor group system wifi inet oneshot disabled + +# Enable zram only once per boot. From: + +# We want one opportunity per boot to enable zram, so we +# use a trigger we fire from the above stanza. If +# persist.sys.zram_enabled becomes true after boot, +# we don't want to run swapon_all at that time. + +on property:sys.boot_completed=1 + trigger sys-boot-completed-set + +on sys-boot-completed-set && property:persist.sys.zram_enabled=1 + swapon_all /vendor/etc/fstab.${ro.hardware} diff --git a/sepolicy/common/file_contexts b/sepolicy/common/file_contexts index 46edf5b..a03f11e 100644 --- a/sepolicy/common/file_contexts +++ b/sepolicy/common/file_contexts @@ -9,6 +9,7 @@ /dev/block/vdc u:object_r:userdata_block_device:s0 /dev/block/vdd u:object_r:metadata_block_device:s0 /dev/block/vde u:object_r:system_block_device:s0 +/dev/block/zram0 u:object_r:swap_block_device:s0 /dev/goldfish_pipe u:object_r:qemu_device:s0 /dev/goldfish_sync u:object_r:qemu_device:s0 diff --git a/sepolicy/common/vendor_init.te b/sepolicy/common/vendor_init.te index b18d391..351cf32 100644 --- a/sepolicy/common/vendor_init.te +++ b/sepolicy/common/vendor_init.te @@ -1 +1,3 @@ set_prop(vendor_init, qemu_prop) +allow vendor_init kernel:system module_request; +allow vendor_init ram_device:blk_file setattr; @@ -107,6 +107,8 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += ro.control_privapp_permissions=enforce PRODUCT_PROPERTY_OVERRIDES += ro.hardware.power=ranchu +PRODUCT_PROPERTY_OVERRIDES += persist.sys.zram_enabled=1 \ + PRODUCT_PACKAGES += \ camera.device@1.0-impl \ android.hardware.camera.provider@2.4-service \ |