Skip to content
Permalink
Browse files

Merge branch 'jellybean' into jellybean-3.4

  • Loading branch information
Dazzozo committed Jan 18, 2013
2 parents 0bf1bc6 + 3f9601e commit 3cac827fec6da4f67bde09a5933f758f759b1e75
Showing with 53 additions and 9 deletions.
  1. +6 −0 BoardConfig.mk
  2. +35 −0 overlay/frameworks/base/core/res/res/values/arrays.xml
  3. +12 −9 system.prop
@@ -11,6 +11,7 @@ TARGET_NO_RADIOIMAGE := true

TARGET_CPU_ABI := armeabi-v7a
TARGET_CPU_ABI2 := armeabi
TARGET_CPU_SMP := true

TARGET_ARCH := arm
TARGET_ARCH_VARIANT := armv7-a-neon
@@ -21,6 +22,8 @@ COMMON_GLOBAL_CFLAGS += -DQCOM_HARDWARE
TARGET_GLOBAL_CFLAGS += -mfpu=neon -mfloat-abi=softfp
TARGET_GLOBAL_CPPFLAGS += -mfpu=neon -mfloat-abi=softfp

WITH_JIT := true

# Optimisations used by Qualcomm
TARGET_CORTEX_CACHE_LINE_32 := true
TARGET_USE_SPARROW_BIONIC_OPTIMIZATION := true
@@ -60,7 +63,10 @@ BOARD_USE_SKIA_LCDTEXT := true
COMMON_GLOBAL_CFLAGS += -DQCOM_ICS_DECODERS -DQCOM_NO_SECURE_PLAYBACK

# Web Rendering
ENABLE_JSC_JIT := true
ENABLE_WEBGL := true
HTTP := chrome
JS_ENGINE := v8
TARGET_FORCE_CPU_UPLOAD := true

# USB
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/colors.xml
**
** Copyright 2006, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

<!-- Defines the shutdown options shown in the reboot dialog. -->
<array name="shutdown_reboot_options" translatable="false">
<item>@string/reboot_reboot</item>
<item>@string/reboot_recovery</item>
</array>

<!-- Do not translate. Defines the shutdown actions passed to the kernel.
The first item should be empty for regular reboot. -->
<string-array name="shutdown_reboot_actions" translatable="false">
<item></item>
<item>recovery</item>
</string-array>

</resources>
@@ -3,24 +3,27 @@
#

# Audio
dev.pm.dyn_sample_period=700000
dev.pm.dyn_samplingrate=1
headset.hook.delay=500

# Bluetooth
ro.bluetooth.remote.autoconnect=true
ro.bluetooth.request.master=true
ro.qualcomm.bluetooth.dun=true
ro.qualcomm.bluetooth.ftp=true

# CWM
ro.cwm.enable_key_repeat=true

# Dalvik
dalvik.vm.dexopt-data-only=1
dalvik.vm.execution-mode=int:jit
dalvik.vm.heapgrowthlimit=36m
dalvik.vm.heapsize=128m
dalvik.vm.heapgrowthlimit=32m
dalvik.vm.heapsize=76m
dalvik.vm.heapstartsize=5m

# Display
debug.composition.type=mdp
debug.fb.rgb565=0
debug.enabletr=false
debug.hwc.dynThreshold=1.9
debug.sf.swaprect=1
hwui.render_dirty_regions=true
ro.max.fling_velocity=4000
ro.opengles.version=131072
@@ -33,8 +36,8 @@ ro.confg.hw_appversion=U8815VCM10_KERNEL

# Qualcomm
com.qc.hardware=true
debug.composition.7x27A.type=mdp
hwui.render_dirty_regions.7x27A=true
dev.pm.dyn_sample_period=700000
dev.pm.dyn_samplingrate=1
ro.hw_plat=7x27A
ro.vendor.extension_library=/system/lib/libqc-opt.so

0 comments on commit 3cac827

Please sign in to comment.
You can’t perform that action at this time.