Skip to content
Permalink
Browse files

Merge branch 'jellybean' into cm-10.1

Conflicts:
	BoardConfig.mk
  • Loading branch information
Dazzozo committed Dec 22, 2012
2 parents 2292c48 + cf5db2c commit 92a26907bd8bc1b920bfd60680a241e5885c3251
Showing with 9 additions and 3 deletions.
  1. +5 −1 BoardConfig.mk
  2. +4 −2 system.prop
@@ -19,6 +19,7 @@ TARGET_ARCH_VARIANT := armv7-a-neon
ARCH_ARM_HAVE_TLS_REGISTER := true

BOARD_USES_QCOM_HARDWARE := true
COMMON_GLOBAL_CFLAGS += -DQCOM_HARDWARE

TARGET_GLOBAL_CFLAGS += -mfpu=neon -mfloat-abi=softfp
TARGET_GLOBAL_CPPFLAGS += -mfpu=neon -mfloat-abi=softfp
@@ -56,7 +57,7 @@ BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := u8815
BOARD_RIL_CLASS := ../../../device/huawei/u8815/ril/

# Graphics
COMMON_GLOBAL_CFLAGS += -DQCOM_HARDWARE -DQCOM_NO_SECURE_PLAYBACK -DQCOM_ICS_COMPAT
COMMON_GLOBAL_CFLAGS += -DQCOM_ICS_COMPAT
BOARD_EGL_CFG := device/huawei/u8815/configs/egl.cfg
USE_OPENGL_RENDERER := true
BOARD_AVOID_DRAW_TEXTURE_EXTENSION := true
@@ -66,6 +67,9 @@ TARGET_NO_HW_OVERLAY := true
BOARD_USE_LEGACY_TOUCHSCREEN := true
#BOARD_ADRENO_DECIDE_TEXTURE_TARGET := true

# Video
COMMON_GLOBAL_CFLAGS += -DQCOM_NO_SECURE_PLAYBACK

# Web Rendering
WITH_JIT := true
ENABLE_JSC_JIT := true
@@ -18,7 +18,9 @@ dalvik.vm.heapsize=128m
dalvik.vm.heapstartsize=5m

# Display
debug.composition.type=mdp
# We should be using mdp composition but
# this is causing issues for 7x27a on CM
debug.composition.type=gpu
debug.hwc.dynThreshold=1.91
debug.sf.hw=1
debug.sf.swaprect=1
@@ -36,7 +38,7 @@ ro.confg.hw_appversion=U8815VCM10_1_KERNEL

# Qualcomm
com.qc.hardware=true
debug.composition.7x27A.type=mdp
debug.composition.7x27A.type=gpu
hwui.render_dirty_regions.7x27A=true
ro.hw_plat=7x27A
ro.vendor.extension_library=/system/lib/libqc-opt.so

0 comments on commit 92a2690

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