From e7056c521ab912a011181d8701e356ead5a3ca93 Mon Sep 17 00:00:00 2001 From: PaulK Date: Wed, 12 Oct 2011 20:05:34 +0200 Subject: Imported commit 51b3d8e666762de78898a65c5f065e035bba46e0 back to replicant-2.3 --- BoardConfigCommon.mk | 2 +- device_base.mk | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index f980588..d11170f 100755 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -70,7 +70,7 @@ TARGET_GLOBAL_CPPFLAGS += -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp WPA_SUPPLICANT_VERSION := VER_0_6_X BOARD_WPA_SUPPLICANT_DRIVER := WEXT BOARD_WLAN_DEVICE := bcm4329 -WIFI_DRIVER_MODULE_PATH := "/system/modules/bcm4329.ko" +WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/bcm4329.ko" WIFI_DRIVER_FW_STA_PATH := "/vendor/firmware/fw_bcm4329.bin" WIFI_DRIVER_FW_AP_PATH := "/vendor/firmware/fw_bcm4329_apsta.bin" WIFI_DRIVER_MODULE_NAME := "bcm4329" diff --git a/device_base.mk b/device_base.mk index 6d0d911..f3aa3b9 100644 --- a/device_base.mk +++ b/device_base.mk @@ -125,9 +125,14 @@ PRODUCT_COPY_FILES += \ frameworks/base/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 +# Use software rendering +PRODUCT_PROPERTY_OVERRIDES += \ + debug.sf.hw=0 + + # The OpenGL ES API level that is natively supported by this device. # This is a 16.16 fixed point number -PRODUCT_PROPERTY_OVERRIDES := \ +PRODUCT_PROPERTY_OVERRIDES += \ ro.opengles.version=131072 # These are the hardware-specific settings that are stored in system properties. @@ -154,9 +159,9 @@ else LOCAL_WIFI_MODULE := $(TARGET_PREBUILT_WIFI_MODULE) endif -PRODUCT_COPY_FILES += \ - $(LOCAL_WIFI_MODULE):system/modules/bcm4329.ko \ - device/samsung/crespo/scsi_wait_scan.ko:system/modules/scsi_wait_scan.ko +#PRODUCT_COPY_FILES += \ +# $(LOCAL_WIFI_MODULE):system/modules/bcm4329.ko \ +# device/samsung/crespo/scsi_wait_scan.ko:system/modules/scsi_wait_scan.ko ifeq ($(TARGET_PREBUILT_KERNEL),) LOCAL_KERNEL := device/samsung/crespo/kernel -- cgit v1.1