From edd0b28eb7549bad9340168e43f46ad291911d8f Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Sat, 21 Dec 2013 17:05:37 +0100 Subject: SoftwareGL Signed-off-by: Paul Kocialkowski --- BoardConfigCommon.mk | 12 ++---------- device_base.mk | 6 ++---- full_crespo.mk | 7 ------- .../base/packages/SettingsProvider/res/values/defaults.xml | 1 + 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 691a6fe..1e65126 100755 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -96,16 +96,8 @@ WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcmdhd.bin" WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcmdhd_apsta.bin" WIFI_DRIVER_FW_PATH_P2P := "/vendor/firmware/fw_bcmdhd_p2p.bin" -USE_OPENGL_RENDERER := true - -# TARGET_DISABLE_TRIPLE_BUFFERING can be used to disable triple buffering -# on per target basis. On crespo it is possible to do so in theory -# to save memory, however, there are currently some limitations in the -# OpenGL ES driver that in conjunction with disable triple-buffering -# would hurt performance significantly (see b/6016711) -TARGET_DISABLE_TRIPLE_BUFFERING := false - -BOARD_ALLOW_EGL_HIBERNATION := true +USE_OPENGL_RENDERER := false +TARGET_DISABLE_TRIPLE_BUFFERING := true # hwcomposer: custom vsync ioctl BOARD_CUSTOM_VSYNC_IOCTL := true diff --git a/device_base.mk b/device_base.mk index 4ed29c2..2b4555a 100644 --- a/device_base.mk +++ b/device_base.mk @@ -44,8 +44,7 @@ DEVICE_PACKAGE_OVERLAYS += device/samsung/crespo/overlay # These are the hardware-specific configuration files PRODUCT_COPY_FILES := \ - device/samsung/crespo/vold.fstab:system/etc/vold.fstab \ - device/samsung/crespo/egl.cfg:system/lib/egl/egl.cfg + device/samsung/crespo/vold.fstab:system/etc/vold.fstab # Init files PRODUCT_COPY_FILES += \ @@ -194,8 +193,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \ frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ - frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \ - packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml + frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml # The OpenGL ES API level that is natively supported by this device. # This is a 16.16 fixed point number diff --git a/full_crespo.mk b/full_crespo.mk index 13f9020..68b8216 100644 --- a/full_crespo.mk +++ b/full_crespo.mk @@ -22,13 +22,6 @@ # Get the long list of APNs PRODUCT_COPY_FILES := device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml -# Live Wallpapers -PRODUCT_PACKAGES += \ - LiveWallpapers \ - LiveWallpapersPicker \ - VisualizationWallpapers \ - librs_jni - # Inherit from those products. Most specific first. $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) # This is where we'd set a backup provider if we had one diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml index a6af5fd..0e01e09 100644 --- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml +++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml @@ -19,4 +19,5 @@ true true + 0% -- cgit v1.2.3