Update makefiles after merge
Change-Id: I209c6246ece9f59fd432e427df5717f788d3a3c4
diff --git a/libsrtp.target.darwin-arm.mk b/libsrtp.target.darwin-arm.mk
index 4e3fd4a..8983654 100644
--- a/libsrtp.target.darwin-arm.mk
+++ b/libsrtp.target.darwin-arm.mk
@@ -166,6 +166,8 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -283,7 +285,10 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libsrtp.target.darwin-arm64.mk b/libsrtp.target.darwin-arm64.mk
index 6b09cab..14cba2f 100644
--- a/libsrtp.target.darwin-arm64.mk
+++ b/libsrtp.target.darwin-arm64.mk
@@ -154,6 +154,8 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
--param=ssp-buffer-size=4 \
@@ -259,7 +261,10 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libsrtp.target.darwin-mips.mk b/libsrtp.target.darwin-mips.mk
index 3cda462..934f8d9 100644
--- a/libsrtp.target.darwin-mips.mk
+++ b/libsrtp.target.darwin-mips.mk
@@ -161,6 +161,8 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -273,7 +275,10 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libsrtp.target.darwin-x86.mk b/libsrtp.target.darwin-x86.mk
index 1815137..4cda4d6 100644
--- a/libsrtp.target.darwin-x86.mk
+++ b/libsrtp.target.darwin-x86.mk
@@ -160,6 +160,8 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
--param=ssp-buffer-size=4 \
@@ -271,7 +273,10 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libsrtp.target.darwin-x86_64.mk b/libsrtp.target.darwin-x86_64.mk
index 64542f4..2167689 100644
--- a/libsrtp.target.darwin-x86_64.mk
+++ b/libsrtp.target.darwin-x86_64.mk
@@ -159,6 +159,8 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -269,7 +271,10 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libsrtp.target.linux-arm.mk b/libsrtp.target.linux-arm.mk
index 4e3fd4a..8983654 100644
--- a/libsrtp.target.linux-arm.mk
+++ b/libsrtp.target.linux-arm.mk
@@ -166,6 +166,8 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -283,7 +285,10 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libsrtp.target.linux-arm64.mk b/libsrtp.target.linux-arm64.mk
index 6b09cab..14cba2f 100644
--- a/libsrtp.target.linux-arm64.mk
+++ b/libsrtp.target.linux-arm64.mk
@@ -154,6 +154,8 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
--param=ssp-buffer-size=4 \
@@ -259,7 +261,10 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libsrtp.target.linux-mips.mk b/libsrtp.target.linux-mips.mk
index 3cda462..934f8d9 100644
--- a/libsrtp.target.linux-mips.mk
+++ b/libsrtp.target.linux-mips.mk
@@ -161,6 +161,8 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -273,7 +275,10 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libsrtp.target.linux-x86.mk b/libsrtp.target.linux-x86.mk
index 1815137..4cda4d6 100644
--- a/libsrtp.target.linux-x86.mk
+++ b/libsrtp.target.linux-x86.mk
@@ -160,6 +160,8 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
--param=ssp-buffer-size=4 \
@@ -271,7 +273,10 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libsrtp.target.linux-x86_64.mk b/libsrtp.target.linux-x86_64.mk
index 64542f4..2167689 100644
--- a/libsrtp.target.linux-x86_64.mk
+++ b/libsrtp.target.linux-x86_64.mk
@@ -159,6 +159,8 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -269,7 +271,10 @@
-Wno-non-virtual-dtor
+LOCAL_FDO_SUPPORT_Release := false
+
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
