Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3668e11 authored by Jiyong Park's avatar Jiyong Park
Browse files

dalvik sysprop settings are optional

dalvik sysprop settings in these mk files are changed to optional ones
using the new 'a ?= b' syntax, to better express the intent that these
provides safe default values which will be used when they are set in
a product-specific mk file.

This is also in preparation for
I9c073a21c8257987cf2378012cadaeeeb698a4fb, which when lands will
prohibit duplicated sysprop assignments.

Bug: 117892318
Bug: 158735147
Test: m

Exempt-From-Owner-Approval: cherry-pick from internal

Merged-In: Ia3528c0c2f9715ff10b85b549d739c9263ab6a7e
(cherry picked from commit 04f86d1c)
Change-Id: Ia3528c0c2f9715ff10b85b549d739c9263ab6a7e
parent a97e47b2
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@
# Provides overrides to configure the Dalvik heap for a standard high density
# phone with around 512MB total RAM.

PRODUCT_PROPERTY_OVERRIDES += \
    dalvik.vm.heapstartsize=5m \
    dalvik.vm.heapgrowthlimit=48m \
    dalvik.vm.heapsize=128m \
    dalvik.vm.heaptargetutilization=0.75 \
    dalvik.vm.heapminfree=512k \
    dalvik.vm.heapmaxfree=2m
PRODUCT_VENDOR_PROPERTIES += \
    dalvik.vm.heapstartsize?=5m \
    dalvik.vm.heapgrowthlimit?=48m \
    dalvik.vm.heapsize?=128m \
    dalvik.vm.heaptargetutilization?=0.75 \
    dalvik.vm.heapminfree?=512k \
    dalvik.vm.heapmaxfree?=2m
+6 −6
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@

# Provides overrides to configure the Dalvik heap for a standard high density phone.

PRODUCT_PROPERTY_OVERRIDES += \
    dalvik.vm.heapstartsize=5m \
    dalvik.vm.heapsize=32m \
    dalvik.vm.heaptargetutilization=0.75 \
    dalvik.vm.heapminfree=512k \
    dalvik.vm.heapmaxfree=2m
PRODUCT_VENDOR_PROPERTIES += \
    dalvik.vm.heapstartsize?=5m \
    dalvik.vm.heapsize?=32m \
    dalvik.vm.heaptargetutilization?=0.75 \
    dalvik.vm.heapminfree?=512k \
    dalvik.vm.heapmaxfree?=2m
+7 −7
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@

# Provides overrides to configure the Dalvik heap for a xhdpi phone

PRODUCT_PROPERTY_OVERRIDES += \
    dalvik.vm.heapstartsize=8m \
    dalvik.vm.heapgrowthlimit=96m \
    dalvik.vm.heapsize=256m \
    dalvik.vm.heaptargetutilization=0.75 \
    dalvik.vm.heapminfree=512k \
    dalvik.vm.heapmaxfree=8m
PRODUCT_VENDOR_PROPERTIES += \
    dalvik.vm.heapstartsize?=8m \
    dalvik.vm.heapgrowthlimit?=96m \
    dalvik.vm.heapsize?=256m \
    dalvik.vm.heaptargetutilization?=0.75 \
    dalvik.vm.heapminfree?=512k \
    dalvik.vm.heapmaxfree?=8m
+7 −7
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@
# Provides overrides to configure the Dalvik heap for a 2GB phone
# 192m of RAM gives enough space for 5 8 megapixel camera bitmaps in RAM.

PRODUCT_PROPERTY_OVERRIDES += \
    dalvik.vm.heapstartsize=8m \
    dalvik.vm.heapgrowthlimit=192m \
    dalvik.vm.heapsize=512m \
    dalvik.vm.heaptargetutilization=0.75 \
    dalvik.vm.heapminfree=512k \
    dalvik.vm.heapmaxfree=8m
PRODUCT_VENDOR_PROPERTIES += \
    dalvik.vm.heapstartsize?=8m \
    dalvik.vm.heapgrowthlimit?=192m \
    dalvik.vm.heapsize?=512m \
    dalvik.vm.heaptargetutilization?=0.75 \
    dalvik.vm.heapminfree?=512k \
    dalvik.vm.heapmaxfree?=8m
+7 −7
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@

# Provides overrides to configure the Dalvik heap for a 4GB phone

PRODUCT_PROPERTY_OVERRIDES += \
    dalvik.vm.heapstartsize=8m \
    dalvik.vm.heapgrowthlimit=192m \
    dalvik.vm.heapsize=512m \
    dalvik.vm.heaptargetutilization=0.6 \
    dalvik.vm.heapminfree=8m \
    dalvik.vm.heapmaxfree=16m
PRODUCT_VENDOR_PROPERTIES += \
    dalvik.vm.heapstartsize?=8m \
    dalvik.vm.heapgrowthlimit?=192m \
    dalvik.vm.heapsize?=512m \
    dalvik.vm.heaptargetutilization?=0.6 \
    dalvik.vm.heapminfree?=8m \
    dalvik.vm.heapmaxfree?=16m
Loading