Update makefiles after merge
Change-Id: I4fbcad72e72e72d186ac758191157f83b5da5dd9
diff --git a/icudata.host.darwin-arm.mk b/icudata.host.darwin-arm.mk
index 0ca2396..d5a2e37 100644
--- a/icudata.host.darwin-arm.mk
+++ b/icudata.host.darwin-arm.mk
@@ -97,6 +97,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -167,7 +169,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icudata.host.darwin-arm64.mk b/icudata.host.darwin-arm64.mk
index fd482b5..db3bae4 100644
--- a/icudata.host.darwin-arm64.mk
+++ b/icudata.host.darwin-arm64.mk
@@ -96,6 +96,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -165,7 +167,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icudata.host.darwin-mips.mk b/icudata.host.darwin-mips.mk
index 1f17b44..7c8d65e 100644
--- a/icudata.host.darwin-mips.mk
+++ b/icudata.host.darwin-mips.mk
@@ -98,6 +98,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -169,7 +171,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icudata.host.darwin-x86.mk b/icudata.host.darwin-x86.mk
index 0ca2396..d5a2e37 100644
--- a/icudata.host.darwin-x86.mk
+++ b/icudata.host.darwin-x86.mk
@@ -97,6 +97,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -167,7 +169,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icudata.host.darwin-x86_64.mk b/icudata.host.darwin-x86_64.mk
index 9446e2a..1be8953 100644
--- a/icudata.host.darwin-x86_64.mk
+++ b/icudata.host.darwin-x86_64.mk
@@ -97,6 +97,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -167,7 +169,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icudata.host.linux-arm.mk b/icudata.host.linux-arm.mk
index d984e69..d74e69e 100644
--- a/icudata.host.linux-arm.mk
+++ b/icudata.host.linux-arm.mk
@@ -98,6 +98,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -169,7 +171,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icudata.host.linux-arm64.mk b/icudata.host.linux-arm64.mk
index bb30bee..e3e62d8 100644
--- a/icudata.host.linux-arm64.mk
+++ b/icudata.host.linux-arm64.mk
@@ -97,6 +97,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -167,7 +169,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icudata.host.linux-mips.mk b/icudata.host.linux-mips.mk
index d68203c..350c2ba 100644
--- a/icudata.host.linux-mips.mk
+++ b/icudata.host.linux-mips.mk
@@ -99,6 +99,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -171,7 +173,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icudata.host.linux-x86.mk b/icudata.host.linux-x86.mk
index d984e69..d74e69e 100644
--- a/icudata.host.linux-x86.mk
+++ b/icudata.host.linux-x86.mk
@@ -98,6 +98,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -169,7 +171,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icudata.host.linux-x86_64.mk b/icudata.host.linux-x86_64.mk
index e70e670..9600390 100644
--- a/icudata.host.linux-x86_64.mk
+++ b/icudata.host.linux-x86_64.mk
@@ -98,6 +98,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -169,7 +171,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icui18n.host.darwin-arm.mk b/icui18n.host.darwin-arm.mk
index 5e54ffe..08127e3 100644
--- a/icui18n.host.darwin-arm.mk
+++ b/icui18n.host.darwin-arm.mk
@@ -247,6 +247,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -320,7 +322,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icui18n.host.darwin-arm64.mk b/icui18n.host.darwin-arm64.mk
index 16ee6b8..1c0c873 100644
--- a/icui18n.host.darwin-arm64.mk
+++ b/icui18n.host.darwin-arm64.mk
@@ -246,6 +246,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -318,7 +320,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icui18n.host.darwin-mips.mk b/icui18n.host.darwin-mips.mk
index 12c29f4..23e724d 100644
--- a/icui18n.host.darwin-mips.mk
+++ b/icui18n.host.darwin-mips.mk
@@ -248,6 +248,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -322,7 +324,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icui18n.host.darwin-x86.mk b/icui18n.host.darwin-x86.mk
index 5e54ffe..08127e3 100644
--- a/icui18n.host.darwin-x86.mk
+++ b/icui18n.host.darwin-x86.mk
@@ -247,6 +247,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -320,7 +322,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icui18n.host.darwin-x86_64.mk b/icui18n.host.darwin-x86_64.mk
index 9295b3e..c1db147 100644
--- a/icui18n.host.darwin-x86_64.mk
+++ b/icui18n.host.darwin-x86_64.mk
@@ -247,6 +247,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -320,7 +322,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icui18n.host.linux-arm.mk b/icui18n.host.linux-arm.mk
index 6a85e4e..c0fdcd1 100644
--- a/icui18n.host.linux-arm.mk
+++ b/icui18n.host.linux-arm.mk
@@ -248,6 +248,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -322,7 +324,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icui18n.host.linux-arm64.mk b/icui18n.host.linux-arm64.mk
index 1f123b5..5a16f2d 100644
--- a/icui18n.host.linux-arm64.mk
+++ b/icui18n.host.linux-arm64.mk
@@ -247,6 +247,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -320,7 +322,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icui18n.host.linux-mips.mk b/icui18n.host.linux-mips.mk
index cb7bc64..5e482af 100644
--- a/icui18n.host.linux-mips.mk
+++ b/icui18n.host.linux-mips.mk
@@ -249,6 +249,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -324,7 +326,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icui18n.host.linux-x86.mk b/icui18n.host.linux-x86.mk
index 6a85e4e..c0fdcd1 100644
--- a/icui18n.host.linux-x86.mk
+++ b/icui18n.host.linux-x86.mk
@@ -248,6 +248,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -322,7 +324,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icui18n.host.linux-x86_64.mk b/icui18n.host.linux-x86_64.mk
index b1dfa05..d50f036 100644
--- a/icui18n.host.linux-x86_64.mk
+++ b/icui18n.host.linux-x86_64.mk
@@ -248,6 +248,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -322,7 +324,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icuuc.host.darwin-arm.mk b/icuuc.host.darwin-arm.mk
index 9bc0fbd..4cd5daa 100644
--- a/icuuc.host.darwin-arm.mk
+++ b/icuuc.host.darwin-arm.mk
@@ -252,6 +252,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -325,7 +327,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icuuc.host.darwin-arm64.mk b/icuuc.host.darwin-arm64.mk
index 35eec82..11a219a 100644
--- a/icuuc.host.darwin-arm64.mk
+++ b/icuuc.host.darwin-arm64.mk
@@ -251,6 +251,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -323,7 +325,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icuuc.host.darwin-mips.mk b/icuuc.host.darwin-mips.mk
index c74d7b7..4434f04 100644
--- a/icuuc.host.darwin-mips.mk
+++ b/icuuc.host.darwin-mips.mk
@@ -253,6 +253,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -327,7 +329,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icuuc.host.darwin-x86.mk b/icuuc.host.darwin-x86.mk
index 9bc0fbd..4cd5daa 100644
--- a/icuuc.host.darwin-x86.mk
+++ b/icuuc.host.darwin-x86.mk
@@ -252,6 +252,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -325,7 +327,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icuuc.host.darwin-x86_64.mk b/icuuc.host.darwin-x86_64.mk
index 9a2dd79..1492640 100644
--- a/icuuc.host.darwin-x86_64.mk
+++ b/icuuc.host.darwin-x86_64.mk
@@ -252,6 +252,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -325,7 +327,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icuuc.host.linux-arm.mk b/icuuc.host.linux-arm.mk
index 6028b67..fe9f695 100644
--- a/icuuc.host.linux-arm.mk
+++ b/icuuc.host.linux-arm.mk
@@ -253,6 +253,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -327,7 +329,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icuuc.host.linux-arm64.mk b/icuuc.host.linux-arm64.mk
index c7e8add..b15b496 100644
--- a/icuuc.host.linux-arm64.mk
+++ b/icuuc.host.linux-arm64.mk
@@ -252,6 +252,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -325,7 +327,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icuuc.host.linux-mips.mk b/icuuc.host.linux-mips.mk
index 9e75581..69d7ccc 100644
--- a/icuuc.host.linux-mips.mk
+++ b/icuuc.host.linux-mips.mk
@@ -254,6 +254,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -329,7 +331,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icuuc.host.linux-x86.mk b/icuuc.host.linux-x86.mk
index 6028b67..fe9f695 100644
--- a/icuuc.host.linux-x86.mk
+++ b/icuuc.host.linux-x86.mk
@@ -253,6 +253,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -327,7 +329,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/icuuc.host.linux-x86_64.mk b/icuuc.host.linux-x86_64.mk
index e234dbb..aec4b00 100644
--- a/icuuc.host.linux-x86_64.mk
+++ b/icuuc.host.linux-x86_64.mk
@@ -253,6 +253,8 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -327,7 +329,10 @@
-Wno-deprecated
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
# Undefine ANDROID for host modules
LOCAL_CFLAGS += -UANDROID
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
