Skip to content
Permalink
Browse files

WE AOSP NOW

  • Loading branch information...
Dazzozo committed Sep 23, 2013
1 parent 4c26eb7 commit 79c7e1d35d41f9e3a94522d688e73fd3b636e19f
@@ -1,2 +1,2 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/u8815.mk
$(LOCAL_DIR)/full_u8815.mk
@@ -60,9 +60,6 @@ BOARD_USES_QCOM_GPS := true
BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 50000
BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := u8815

# Hardware
BOARD_HARDWARE_CLASS := device/huawei/u8815/cmhw

# RIL
BOARD_RIL_CLASS := ../../../device/huawei/u8815/ril/

25 cm.mk

This file was deleted.

This file was deleted.

@@ -103,7 +103,3 @@ PRODUCT_COPY_FILES += \
PRODUCT_TAGS += dalvik.gc.type-precise

$(call inherit-product, build/target/product/full.mk)

PRODUCT_NAME := huawei_u8815
PRODUCT_DEVICE := u8815
PRODUCT_BRAND := Huawei
@@ -21,14 +21,21 @@
# lines, full and toro, hence its name.
#

# Inherit from those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
# Get the long list of APNs
PRODUCT_COPY_FILES := device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml

# Inherit the common Open Source product configuration
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
# Inherit from u8815 device
$(call inherit-product, device/huawei/u8815/device.mk)

# Set those variables here to overwrite the inherited values.
PRODUCT_NAME := huawei_u8815
PRODUCT_NAME := full_u8815
PRODUCT_DEVICE := u8815
PRODUCT_BRAND := Huawei
PRODUCT_MANUFACTURER := Huawei
PRODUCT_MODEL := Ascend G300

PRODUCT_RELEASE_NAME := U8815

PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=U8815 BUILD_ID=JOP40C BUILD_FINGERPRINT=ZTE/N880E_JB4_2/atlas40:4.2/JOP40C/20121121.110335:user/release-keys PRIVATE_BUILD_DESC="N880E_JB4_2-user 4.2 JOP40C 20121121.110335 release-keys" BUILD_NUMBER=20121121.110335

This file was deleted.

@@ -122,11 +122,8 @@
<!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
<bool name="config_intrusiveNotificationLed">true</bool>

<!-- Is the battery LED intrusive? Used to decide if there should be a disable option -->
<bool name="config_intrusiveBatteryLed">true</bool>

<!-- Does the battery LED support multiple colors? Used to decide if the user can change the colors -->
<bool name="config_multiColorBatteryLed">true</bool>
<!-- Is the device capable of hot swapping an UICC Card -->
<bool name="config_hotswapCapable">true</bool>

<!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
The N entries of this array define N + 1 zones as follows:
@@ -197,16 +194,4 @@
<item>dualmic_enabled=true=false</item>
</string-array>

<!-- Hardware 'face' keys present on the device, stored as a bit field.
This integer should equal the sum of the corresponding value for each
of the following keys present:
1 - Home
2 - Back
4 - Menu
8 - Assistant (search)
16 - App switch
For example, a device with Home, Back and Menu keys would set this
config to 7. -->
<integer name="config_deviceHardwareKeys">7</integer>

</resources>
@@ -31,6 +31,4 @@
<!-- Determines if device implements a noise suppression device for in call audio-->
<bool name="has_in_call_noise_suppression">true</bool>

<!-- Audio parameter for setting noise suppression-->
<string name="in_call_noise_suppression_audioparameter">noise_suppression=on=off</string>
</resources>

This file was deleted.

@@ -0,0 +1,63 @@
From 3b32931252a51d5aed91e2028928be907ebdff7c Mon Sep 17 00:00:00 2001
From: Matthew Hui <mhui@codeaurora.org>
Date: Sun, 1 Jan 2012 16:51:26 -0500
Subject: [PATCH] external/webkit: use Cpu Upload path

Use Cpu Upload mode since the Gpu mode is not working
and expected to be slower.

Change-Id: Iacb6de4a4e054e4f6ebb07d8a8209228e78e5ee0
---
Source/WebCore/Android.mk | 5 +++++
Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp | 4 ++++
Source/WebCore/platform/graphics/android/rendering/TransferQueue.h | 4 ++++
3 files changed, 13 insertions(+)

diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk
index b1b430c..1f8868e 100644
--- a/Source/WebCore/Android.mk
+++ b/Source/WebCore/Android.mk
@@ -1310,3 +1310,8 @@ ifeq ($(SUPPORT_COMPLEX_SCRIPTS),true)
LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
platform/graphics/android/fonts/HarfbuzzSkia.cpp
endif
+
+# HACK for qcom devices CPU upload mode
+ifeq ($(TARGET_FORCE_CPU_UPLOAD),true)
+LOCAL_CFLAGS += -DFORCE_CPU_UPLOAD
+endif
diff --git a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp
index 7c03219..857d377 100644
--- a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp
@@ -516,7 +516,11 @@ void TransferQueue::setTextureUploadType(TextureUploadType type)

setPendingDiscard();

+#ifdef FORCE_CPU_UPLOAD
+ m_currentUploadType = CpuUpload; // force to cpu upload mode for now until gpu upload mode is fixed
+#else
m_currentUploadType = type;
+#endif
ALOGD("Now we set the upload to %s", m_currentUploadType == GpuUpload ? "GpuUpload" : "CpuUpload");
}

diff --git a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.h b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.h
index 55011b0..4ced1ea 100644
--- a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.h
+++ b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.h
@@ -69,7 +69,11 @@ enum TextureUploadType {
GpuUpload = 1
};

+#ifdef FORCE_CPU_UPLOAD
+#define DEFAULT_UPLOAD_TYPE CpuUpload
+#else
#define DEFAULT_UPLOAD_TYPE GpuUpload
+#endif

class TileTransferData {
public:
--
1.8.4

0 comments on commit 79c7e1d

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