forked from omochi/JavaScriptCore-android-build
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathicu.patch
More file actions
56 lines (51 loc) · 1.85 KB
/
icu.patch
File metadata and controls
56 lines (51 loc) · 1.85 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
diff --git common/Android.mk common/Android.mk
index 00761ea..01ed13c 100644
--- common/Android.mk
+++ common/Android.mk
@@ -145,15 +145,15 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES += $(src_files)
LOCAL_C_INCLUDES += $(c_includes)
LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC
+LOCAL_CPPFLAGS += -std=gnu++03
LOCAL_SHARED_LIBRARIES += libdl
-LOCAL_LDLIBS += $(local_ldlibs)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libicuuc
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
LOCAL_REQUIRED_MODULES += icu-data
-include abi/cpp/use_rtti.mk
-include external/stlport/libstlport.mk
-include $(BUILD_SHARED_LIBRARY)
+LOCAL_CPP_FEATURES += rtti
+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/../../../gen/icu/include/icuuc
+include $(BUILD_STATIC_LIBRARY)
#
diff --git i18n/Android.mk i18n/Android.mk
index a9b7948..85749d6 100644
--- i18n/Android.mk
+++ i18n/Android.mk
@@ -81,7 +81,7 @@ src_files += \
vzone.cpp fphdlimp.cpp fpositer.cpp\
locdspnm.cpp ucol_wgt.cpp \
alphaindex.cpp bocsu.cpp decfmtst.cpp \
- smpdtfst.cpp smpdtfst.h tzfmt.cpp \
+ smpdtfst.cpp tzfmt.cpp \
tzgnames.cpp tznames.cpp tznames_impl.cpp \
udateintervalformat.cpp upluralrules.cpp
@@ -105,14 +105,14 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES += $(src_files)
LOCAL_C_INCLUDES += $(c_includes)
LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC
+LOCAL_CPPFLAGS += -std=gnu++03
LOCAL_SHARED_LIBRARIES += libicuuc
-LOCAL_LDLIBS += $(local_ldlibs)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libicui18n
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
-include abi/cpp/use_rtti.mk
-include external/stlport/libstlport.mk
-include $(BUILD_SHARED_LIBRARY)
+LOCAL_CPP_FEATURES += rtti
+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/../../../gen/icu/include/icui18n
+include $(BUILD_STATIC_LIBRARY)
#