aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-11-07 14:36:20 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-11-07 14:36:20 +0000
commitbb48b113c375578a423101e4483cc230c6cc6ba5 (patch)
tree0bb9ee58e9a0eb172a06e087cb0c5c25abfb2eb9
parent5b4c3836cdcd513a25b14d2fdc5fe8794b36e961 (diff)
downloadicu-bb48b113c375578a423101e4483cc230c6cc6ba5.tar.gz
Update makefiles after merge of Chromium at 233612
This commit was generated by merge_from_chromium.py. Change-Id: I16d0c359e41e5a012538b68861c4b735ef52b901
Diffstat
-rw-r--r--icudata.host.darwin-arm.mk2
-rw-r--r--icudata.host.darwin-mips.mk2
-rw-r--r--icudata.host.darwin-x86.mk2
-rw-r--r--icudata.host.linux-arm.mk2
-rw-r--r--icudata.host.linux-mips.mk2
-rw-r--r--icudata.host.linux-x86.mk2
-rw-r--r--icui18n.host.darwin-arm.mk2
-rw-r--r--icui18n.host.darwin-mips.mk2
-rw-r--r--icui18n.host.darwin-x86.mk2
-rw-r--r--icui18n.host.linux-arm.mk2
-rw-r--r--icui18n.host.linux-mips.mk2
-rw-r--r--icui18n.host.linux-x86.mk2
-rw-r--r--icuuc.host.darwin-arm.mk2
-rw-r--r--icuuc.host.darwin-mips.mk2
-rw-r--r--icuuc.host.darwin-x86.mk2
-rw-r--r--icuuc.host.linux-arm.mk2
-rw-r--r--icuuc.host.linux-mips.mk2
-rw-r--r--icuuc.host.linux-x86.mk2
18 files changed, 36 insertions, 0 deletions
diff --git a/icudata.host.darwin-arm.mk b/icudata.host.darwin-arm.mk
index 3c16731..f11dc37 100644
--- a/icudata.host.darwin-arm.mk
+++ b/icudata.host.darwin-arm.mk
@@ -49,6 +49,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -105,6 +106,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icudata.host.darwin-mips.mk b/icudata.host.darwin-mips.mk
index 2023af3..ceff426 100644
--- a/icudata.host.darwin-mips.mk
+++ b/icudata.host.darwin-mips.mk
@@ -50,6 +50,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -107,6 +108,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icudata.host.darwin-x86.mk b/icudata.host.darwin-x86.mk
index d0a7ea8..7797ca5 100644
--- a/icudata.host.darwin-x86.mk
+++ b/icudata.host.darwin-x86.mk
@@ -49,6 +49,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -107,6 +108,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icudata.host.linux-arm.mk b/icudata.host.linux-arm.mk
index 2994c9e..275dc74 100644
--- a/icudata.host.linux-arm.mk
+++ b/icudata.host.linux-arm.mk
@@ -49,6 +49,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -105,6 +106,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icudata.host.linux-mips.mk b/icudata.host.linux-mips.mk
index 8b6c0b1..5115053 100644
--- a/icudata.host.linux-mips.mk
+++ b/icudata.host.linux-mips.mk
@@ -50,6 +50,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -107,6 +108,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icudata.host.linux-x86.mk b/icudata.host.linux-x86.mk
index 96b4bde..34df3aa 100644
--- a/icudata.host.linux-x86.mk
+++ b/icudata.host.linux-x86.mk
@@ -49,6 +49,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -107,6 +108,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icui18n.host.darwin-arm.mk b/icui18n.host.darwin-arm.mk
index 0f8ef99..7fbda30 100644
--- a/icui18n.host.darwin-arm.mk
+++ b/icui18n.host.darwin-arm.mk
@@ -198,6 +198,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -257,6 +258,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icui18n.host.darwin-mips.mk b/icui18n.host.darwin-mips.mk
index 9b99480..fdfb4a0 100644
--- a/icui18n.host.darwin-mips.mk
+++ b/icui18n.host.darwin-mips.mk
@@ -199,6 +199,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -259,6 +260,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icui18n.host.darwin-x86.mk b/icui18n.host.darwin-x86.mk
index 4becd83..3d1efff 100644
--- a/icui18n.host.darwin-x86.mk
+++ b/icui18n.host.darwin-x86.mk
@@ -198,6 +198,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -259,6 +260,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icui18n.host.linux-arm.mk b/icui18n.host.linux-arm.mk
index f37670a..83d3ea7 100644
--- a/icui18n.host.linux-arm.mk
+++ b/icui18n.host.linux-arm.mk
@@ -198,6 +198,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -257,6 +258,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icui18n.host.linux-mips.mk b/icui18n.host.linux-mips.mk
index fc07504..33f9538 100644
--- a/icui18n.host.linux-mips.mk
+++ b/icui18n.host.linux-mips.mk
@@ -199,6 +199,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -259,6 +260,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icui18n.host.linux-x86.mk b/icui18n.host.linux-x86.mk
index ba88ddb..d7e95a6 100644
--- a/icui18n.host.linux-x86.mk
+++ b/icui18n.host.linux-x86.mk
@@ -198,6 +198,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -259,6 +260,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icuuc.host.darwin-arm.mk b/icuuc.host.darwin-arm.mk
index d31ad5e..d37952e 100644
--- a/icuuc.host.darwin-arm.mk
+++ b/icuuc.host.darwin-arm.mk
@@ -203,6 +203,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -262,6 +263,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icuuc.host.darwin-mips.mk b/icuuc.host.darwin-mips.mk
index 246af12..3a2b238 100644
--- a/icuuc.host.darwin-mips.mk
+++ b/icuuc.host.darwin-mips.mk
@@ -204,6 +204,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -264,6 +265,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icuuc.host.darwin-x86.mk b/icuuc.host.darwin-x86.mk
index 3ab72c6..a23dce7 100644
--- a/icuuc.host.darwin-x86.mk
+++ b/icuuc.host.darwin-x86.mk
@@ -203,6 +203,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -264,6 +265,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icuuc.host.linux-arm.mk b/icuuc.host.linux-arm.mk
index 0ec7e15..cb7ea07 100644
--- a/icuuc.host.linux-arm.mk
+++ b/icuuc.host.linux-arm.mk
@@ -203,6 +203,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -262,6 +263,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icuuc.host.linux-mips.mk b/icuuc.host.linux-mips.mk
index 56b445d..4828caf 100644
--- a/icuuc.host.linux-mips.mk
+++ b/icuuc.host.linux-mips.mk
@@ -204,6 +204,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -264,6 +265,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/icuuc.host.linux-x86.mk b/icuuc.host.linux-x86.mk
index 1965b59..b6aa587 100644
--- a/icuuc.host.linux-x86.mk
+++ b/icuuc.host.linux-x86.mk
@@ -203,6 +203,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -264,6 +265,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANGLE_DX11' \
+ '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 02:43:22 +0000