diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-09-10 10:54:35 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-09-10 10:54:35 +0100 |
commit | 38458a3a4ff2a6082f921257787bb7dac82c2443 (patch) | |
tree | c32bcd0068a14f405d37c34be19bea99e5e80aa7 | |
parent | 69426a19e77c75ef9aef0d64e294f0ac9fbdd9a0 (diff) | |
download | libsrtp-l-preview.tar.gz |
Update makefiles after mergeandroid-wear-5.0.0_r1android-l-preview_r2android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-devlollipop-cts-releasel-preview
Change-Id: I209c6246ece9f59fd432e427df5717f788d3a3c4
-rw-r--r-- | libsrtp.target.darwin-arm.mk | 5 | ||||
-rw-r--r-- | libsrtp.target.darwin-arm64.mk | 5 | ||||
-rw-r--r-- | libsrtp.target.darwin-mips.mk | 5 | ||||
-rw-r--r-- | libsrtp.target.darwin-x86.mk | 5 | ||||
-rw-r--r-- | libsrtp.target.darwin-x86_64.mk | 5 | ||||
-rw-r--r-- | libsrtp.target.linux-arm.mk | 5 | ||||
-rw-r--r-- | libsrtp.target.linux-arm64.mk | 5 | ||||
-rw-r--r-- | libsrtp.target.linux-mips.mk | 5 | ||||
-rw-r--r-- | libsrtp.target.linux-x86.mk | 5 | ||||
-rw-r--r-- | libsrtp.target.linux-x86_64.mk | 5 |
10 files changed, 50 insertions, 0 deletions
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 @@ LOCAL_CPPFLAGS_Debug := \ -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 @@ LOCAL_CPPFLAGS_Release := \ -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 @@ LOCAL_CPPFLAGS_Debug := \ -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 @@ LOCAL_CPPFLAGS_Release := \ -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 @@ LOCAL_CPPFLAGS_Debug := \ -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 @@ LOCAL_CPPFLAGS_Release := \ -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 @@ LOCAL_CPPFLAGS_Debug := \ -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 @@ LOCAL_CPPFLAGS_Release := \ -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 @@ LOCAL_CPPFLAGS_Debug := \ -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 @@ LOCAL_CPPFLAGS_Release := \ -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 @@ LOCAL_CPPFLAGS_Debug := \ -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 @@ LOCAL_CPPFLAGS_Release := \ -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 @@ LOCAL_CPPFLAGS_Debug := \ -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 @@ LOCAL_CPPFLAGS_Release := \ -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 @@ LOCAL_CPPFLAGS_Debug := \ -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 @@ LOCAL_CPPFLAGS_Release := \ -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 @@ LOCAL_CPPFLAGS_Debug := \ -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 @@ LOCAL_CPPFLAGS_Release := \ -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 @@ LOCAL_CPPFLAGS_Debug := \ -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 @@ LOCAL_CPPFLAGS_Release := \ -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) |