auto import from //branches/cupcake_rel/...@141571

diff --git a/darwin-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-gdb b/darwin-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-gdb
index 595507c..77d91d8 100755 (executable)
Binary files a/darwin-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-gdb and b/darwin-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-gdb differ

diff --git a/linux-x86/icu-3.8/makeconv b/linux-x86/icu-3.8/makeconv
new file mode 100755 (executable)
index 0000000..efcb543
Binary files /dev/null and b/linux-x86/icu-3.8/makeconv differ

diff --git a/linux-x86/icu-3.8/readme.txt b/linux-x86/icu-3.8/readme.txt
index 7d1047c..71e78f5 100644 (file)
--- a/linux-x86/icu-3.8/readme.txt
+++ b/linux-x86/icu-3.8/readme.txt
@@ -1,16 +1,20 @@
 This directory contains the Linux versions
-of three ICU tools potentially needed during
+of some ICU tools potentially needed during
 the Android build process. The tools can be
 re-created using the following steps:
 
 (1) Copy the whole "/extlibs/icu-3.8"
-    directory somewhere else.
+    directory somewhere else. Please
+    do not use a vanilla ICU 3.8.1 for
+    this, since the Android version
+    includes some patches for tweaking
+    file sizes.
 
 (2) Change to the copy of the directory.
 
 (3) Execute "./runConfigureICU Linux".
 
-(4) Modify the file "icuconfig.mk".
+(4) Modify the file "icudefs.mk".
     Search for "ENABLE_STATIC" and change
     its value to TRUE. Change the value of
     "ENABLE_SHARED" to empty.

diff --git a/linux-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-gdb b/linux-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-gdb
index 06491e2..fe1d8da 100755 (executable)
Binary files a/linux-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-gdb and b/linux-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-gdb differ