Skip to content

Commit 79c7e1d

Browse files
author
Daz Jones
committedSep 24, 2013
WE AOSP NOW
1 parent 4c26eb7 commit 79c7e1d

22 files changed

+2057
-166
lines changed
 

‎AndroidProducts.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
PRODUCT_MAKEFILES := \
2-
$(LOCAL_DIR)/u8815.mk
2+
$(LOCAL_DIR)/full_u8815.mk

‎BoardConfig.mk

-3
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ BOARD_USES_QCOM_GPS := true
6060
BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 50000
6161
BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := u8815
6262

63-
# Hardware
64-
BOARD_HARDWARE_CLASS := device/huawei/u8815/cmhw
65-
6663
# RIL
6764
BOARD_RIL_CLASS := ../../../device/huawei/u8815/ril/
6865

‎cm.mk

-25
This file was deleted.

‎cmhw/org/cyanogenmod/hardware/VibratorHW.java

-47
This file was deleted.

‎device.mk

-4
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,3 @@ PRODUCT_COPY_FILES += \
103103
PRODUCT_TAGS += dalvik.gc.type-precise
104104

105105
$(call inherit-product, build/target/product/full.mk)
106-
107-
PRODUCT_NAME := huawei_u8815
108-
PRODUCT_DEVICE := u8815
109-
PRODUCT_BRAND := Huawei

‎u8815.mk ‎full_u8815.mk

+10-3
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,21 @@
2121
# lines, full and toro, hence its name.
2222
#
2323

24-
# Inherit from those products. Most specific first.
25-
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
24+
# Get the long list of APNs
25+
PRODUCT_COPY_FILES := device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
26+
27+
# Inherit the common Open Source product configuration
28+
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
2629
# Inherit from u8815 device
2730
$(call inherit-product, device/huawei/u8815/device.mk)
2831

2932
# Set those variables here to overwrite the inherited values.
30-
PRODUCT_NAME := huawei_u8815
33+
PRODUCT_NAME := full_u8815
3134
PRODUCT_DEVICE := u8815
3235
PRODUCT_BRAND := Huawei
3336
PRODUCT_MANUFACTURER := Huawei
3437
PRODUCT_MODEL := Ascend G300
38+
39+
PRODUCT_RELEASE_NAME := U8815
40+
41+
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

‎overlay/frameworks/base/core/res/res/values/arrays.xml

-35
This file was deleted.

‎overlay/frameworks/base/core/res/res/values/config.xml

+2-17
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,8 @@
122122
<!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
123123
<bool name="config_intrusiveNotificationLed">true</bool>
124124

125-
<!-- Is the battery LED intrusive? Used to decide if there should be a disable option -->
126-
<bool name="config_intrusiveBatteryLed">true</bool>
127-
128-
<!-- Does the battery LED support multiple colors? Used to decide if the user can change the colors -->
129-
<bool name="config_multiColorBatteryLed">true</bool>
125+
<!-- Is the device capable of hot swapping an UICC Card -->
126+
<bool name="config_hotswapCapable">true</bool>
130127

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

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

‎overlay/packages/apps/Phone/res/values/config.xml

-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,4 @@
3131
<!-- Determines if device implements a noise suppression device for in call audio-->
3232
<bool name="has_in_call_noise_suppression">true</bool>
3333

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

‎overlay/packages/apps/Settings/res/values/config.xml

-29
This file was deleted.

‎patches/external_webkit/0001-use-cpu-upload-path.patch

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
From 3b32931252a51d5aed91e2028928be907ebdff7c Mon Sep 17 00:00:00 2001
2+
From: Matthew Hui <mhui@codeaurora.org>
3+
Date: Sun, 1 Jan 2012 16:51:26 -0500
4+
Subject: [PATCH] external/webkit: use Cpu Upload path
5+
6+
Use Cpu Upload mode since the Gpu mode is not working
7+
and expected to be slower.
8+
9+
Change-Id: Iacb6de4a4e054e4f6ebb07d8a8209228e78e5ee0
10+
---
11+
Source/WebCore/Android.mk | 5 +++++
12+
Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp | 4 ++++
13+
Source/WebCore/platform/graphics/android/rendering/TransferQueue.h | 4 ++++
14+
3 files changed, 13 insertions(+)
15+
16+
diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk
17+
index b1b430c..1f8868e 100644
18+
--- a/Source/WebCore/Android.mk
19+
+++ b/Source/WebCore/Android.mk
20+
@@ -1310,3 +1310,8 @@ ifeq ($(SUPPORT_COMPLEX_SCRIPTS),true)
21+
LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
22+
platform/graphics/android/fonts/HarfbuzzSkia.cpp
23+
endif
24+
+
25+
+# HACK for qcom devices CPU upload mode
26+
+ifeq ($(TARGET_FORCE_CPU_UPLOAD),true)
27+
+LOCAL_CFLAGS += -DFORCE_CPU_UPLOAD
28+
+endif
29+
diff --git a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp
30+
index 7c03219..857d377 100644
31+
--- a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp
32+
+++ b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp
33+
@@ -516,7 +516,11 @@ void TransferQueue::setTextureUploadType(TextureUploadType type)
34+
35+
setPendingDiscard();
36+
37+
+#ifdef FORCE_CPU_UPLOAD
38+
+ m_currentUploadType = CpuUpload; // force to cpu upload mode for now until gpu upload mode is fixed
39+
+#else
40+
m_currentUploadType = type;
41+
+#endif
42+
ALOGD("Now we set the upload to %s", m_currentUploadType == GpuUpload ? "GpuUpload" : "CpuUpload");
43+
}
44+
45+
diff --git a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.h b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.h
46+
index 55011b0..4ced1ea 100644
47+
--- a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.h
48+
+++ b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.h
49+
@@ -69,7 +69,11 @@ enum TextureUploadType {
50+
GpuUpload = 1
51+
};
52+
53+
+#ifdef FORCE_CPU_UPLOAD
54+
+#define DEFAULT_UPLOAD_TYPE CpuUpload
55+
+#else
56+
#define DEFAULT_UPLOAD_TYPE GpuUpload
57+
+#endif
58+
59+
class TileTransferData {
60+
public:
61+
--
62+
1.8.4
63+

0 commit comments

Comments
 (0)
Failed to load comments.