summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--icu/icu4c-android.patch11
-rw-r--r--icu/makefile.mk5
2 files changed, 16 insertions, 0 deletions
diff --git a/icu/icu4c-android.patch b/icu/icu4c-android.patch
new file mode 100644
index 000000000000..f5b016e6e659
--- /dev/null
+++ b/icu/icu4c-android.patch
@@ -0,0 +1,11 @@
+--- misc/icu/source/config/mh-linux
++++ misc/build/icu/source/config/mh-linux
+@@ -30,7 +30,7 @@
+
+ ## Compiler switch to embed a library name
+ # The initial tab in the next line is to prevent icu-config from reading it.
+- LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
++# LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
+ #SH# # We can't depend on MIDDLE_SO_TARGET being set.
+ #SH# LD_SONAME=
+
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 4db60c0fc963..f0e9dfa5a770 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -54,6 +54,11 @@ PATCH_FILES=\
icu4c-escapespace.patch \
icu4c-strict-c.patch
+.IF "$(OS)"=="ANDROID"
+PATCH_FILES+=\
+ icu4c-android.patch
+.ENDIF
+
.IF "$(GUI)"=="UNX"
.IF "$(SYSBASE)"!=""