Snap for 11510257 from f02f9af6b011c8fd330f67b2ac87f1f102878254 to simpleperf-release

Change-Id: I4085f4d42aeb572617a503347bdcd49510c2eafe

6 files changed, 23 insertions, 16 deletions

diff --git a/device-common.mk b/device-common.mk
index 10f01eb..fb3de7e 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -86,6 +86,9 @@ else
       device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.$(TARGET_HARDWARE)
 endif
 
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.sys.zram_enabled=1
+
 PRODUCT_COPY_FILES += \
     $(TARGET_KERNEL_DIR)/Image.gz:kernel \
     device/linaro/dragonboard/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(TARGET_HARDWARE).rc \
diff --git a/fstab.common b/fstab.common
index cde33c2..c618b7a 100644
--- a/fstab.common
+++ b/fstab.common
@@ -11,3 +11,4 @@ system_ext	/system_ext	erofs	ro				wait,logical,first_stage_mount,slotselect
 product		/product	erofs	ro				wait,logical,first_stage_mount,slotselect
 system_dlkm	/system_dlkm	erofs	ro				wait,logical,first_stage_mount,slotselect
 vendor_dlkm	/vendor_dlkm	erofs	ro				wait,logical,first_stage_mount,slotselect
+/dev/block/zram0					none	swap	defaults	zramsize=75%
diff --git a/init.common.rc b/init.common.rc
index 51a42c6..42a582f 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -16,6 +16,9 @@ on late-fs
     mount_all /vendor/etc/fstab.${ro.hardware} --late
 
 on init
+    # ZRAM setup
+    write /sys/block/zram0/comp_algorithm lz4
+
     # For legacy support
     # See storage config details at http://source.android.com/tech/storage/
     # since /storage is mounted on post-fs in init.rc
@@ -59,6 +62,15 @@ on property:sys.boot_completed=1
     # little cores, not on bigs to be used only by init
     write /dev/cpuset/system-background/cpus 0-3
 
+    trigger sys-boot-completed-set
+
+# 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 sys-boot-completed-set && property:persist.sys.zram_enabled=1
+    swapon_all
+
 service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
                        -Dnl80211 -g@android:wpa_wlan0
     interface aidl android.hardware.wifi.supplicant.ISupplicant/default
diff --git a/linaro_swr/BoardConfig.mk b/linaro_swr/BoardConfig.mk
index c57a9cc..9676554 100644
--- a/linaro_swr/BoardConfig.mk
+++ b/linaro_swr/BoardConfig.mk
@@ -27,8 +27,8 @@ BOARD_BOOTCONFIG := androidboot.hardware=linaro_swr androidboot.boot_devices=soc
 BOARD_BOOTCONFIG += androidboot.verifiedbootstate=orange
 
 # Image Configuration
-BOARD_BOOTIMAGE_PARTITION_SIZE := 103079215104 #96M
-BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 103079215104 #96M
+BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296 #96M
+BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 100663296 #96M
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 21474836480 #20G
 BOARD_FLASH_BLOCK_SIZE := 4096
 # Super partition
@@ -36,8 +36,11 @@ BOARD_SUPER_PARTITION_SIZE := 12437225472
 BOARD_DB_DYNAMIC_PARTITIONS_SIZE := 12433031168 # Reserve 4M for DAP metadata
 BOARD_SUPER_PARTITION_METADATA_DEVICE := super
 BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE := true
-# dlkm partition
+BOARD_DB_DYNAMIC_PARTITIONS_PARTITION_LIST := system vendor system_ext product
+
+# dlkm partitions
 include device/linaro/dragonboard/shared/utils/dlkm_loader/BoardConfig.mk
+BOARD_DB_DYNAMIC_PARTITIONS_PARTITION_LIST += system_dlkm vendor_dlkm
 BOARD_SEPOLICY_DIRS += device/linaro/dragonboard/shared/utils/dlkm_loader/sepolicy/
 
 # Graphics
diff --git a/manifest.xml b/manifest.xml
index d0a07a3..db43cdd 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -64,19 +64,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.media.omx</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IOmx</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IOmxStore</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-   <hal format="hidl">
         <name>android.hardware.soundtrigger</name>
         <transport>hwbinder</transport>
         <version>2.3</version>
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 82370f6..660539c 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -5,6 +5,7 @@
 /dev/block/platform/soc@0/1d84000\.ufshc/by-name/super		u:object_r:super_block_device:s0
 /dev/block/platform/soc@0/1d84000\.ufshc/by-name/userdata	u:object_r:userdata_block_device:s0
 /dev/block/platform/soc@0/1d84000\.ufshc/by-name/misc		u:object_r:misc_block_device:s0
+/dev/block/zram0						u:object_r:swap_block_device:s0
 
 /dev/dri				u:object_r:dri_device:s0
 /dev/dri/card0				u:object_r:graphics_device:s0