summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Carl Shapiro <cshapiro@google.com> 2011-02-02 10:55:28 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-02-02 10:55:28 -0800
commit09128b23292e48d01518d6569dfb2cb88ed6e6d5 (patch)
treee7bcf38c1e4c126b099df48d2d61c073a95acdfd
parent47b8c96b253ab24d0df089c87ce0798d4981400a (diff)
parent85f974e7be05accc3a1f110be5b14f326addc592 (diff)
Merge "Fix the naming of the heap growth limit property." into honeycomb
-rw-r--r--build/phone-hdpi-512-dalvik-heap.mk2
-rw-r--r--build/tablet-dalvik-heap.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/phone-hdpi-512-dalvik-heap.mk b/build/phone-hdpi-512-dalvik-heap.mk
index 630cf035a741..788b68609604 100644
--- a/build/phone-hdpi-512-dalvik-heap.mk
+++ b/build/phone-hdpi-512-dalvik-heap.mk
@@ -19,5 +19,5 @@
PRODUCT_PROPERTY_OVERRIDES += \
dalvik.vm.heapstartsize=5m \
- dalvik.vm.growthlimit=32m \
+ dalvik.vm.heapgrowthlimit=32m \
dalvik.vm.heapsize=128m
diff --git a/build/tablet-dalvik-heap.mk b/build/tablet-dalvik-heap.mk
index 37c3ec531a80..826a380232a0 100644
--- a/build/tablet-dalvik-heap.mk
+++ b/build/tablet-dalvik-heap.mk
@@ -18,5 +18,5 @@
PRODUCT_PROPERTY_OVERRIDES += \
dalvik.vm.heapstartsize=5m \
- dalvik.vm.growthlimit=48m \
+ dalvik.vm.heapgrowthlimit=48m \
dalvik.vm.heapsize=256m