am 9c63cdd6: am ec0f5e5f: Merge "Fix issue #7257947: Need to fix heap limits on Mako" into jb-mr1-dev

* commit '9c63cdd6b0ff28d3a371aa8c6121411fbf7f0a76':
  Fix issue #7257947: Need to fix heap limits on Mako
This commit is contained in:
Dianne Hackborn 2012-10-01 13:47:56 -07:00 committed by Android Git Automerger
commit 290f3f3130
2 changed files with 28 additions and 2 deletions

View File

@ -14,11 +14,11 @@
# limitations under the License. # limitations under the License.
# #
# Provides overrides to configure the Dalvik heap for a standard tablet device. # Provides overrides to configure the Dalvik heap for a xhdpi phone
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
dalvik.vm.heapstartsize=8m \ dalvik.vm.heapstartsize=8m \
dalvik.vm.heapgrowthlimit=64m \ dalvik.vm.heapgrowthlimit=96m \
dalvik.vm.heapsize=256m \ dalvik.vm.heapsize=256m \
dalvik.vm.heaptargetutilization=0.75 \ dalvik.vm.heaptargetutilization=0.75 \
dalvik.vm.heapminfree=512k \ dalvik.vm.heapminfree=512k \

View File

@ -0,0 +1,26 @@
#
# Copyright (C) 2012 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Provides overrides to configure the Dalvik heap for a 2G 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=768m \
dalvik.vm.heaptargetutilization=0.75 \
dalvik.vm.heapminfree=512k \
dalvik.vm.heapmaxfree=8m