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 | 06bb5023d34b9a8f6d9260a6a419090379c363c4 (patch) | |
| tree | f6199213fdde7c04b8ce4120e3251102d276f503 | |
| parent | 80f9f658d37b260f6c96248ddd406fcaf228be11 (diff) | |
| download | openssl-06bb5023d34b9a8f6d9260a6a419090379c363c4.tar.gz | |
Update makefiles after merge
Change-Id: I77961fc375e68c40c3abc5c1d59808bc3b8b2636
| -rw-r--r-- | openssl.target.darwin-arm.mk | 5 | ||||
| -rw-r--r-- | openssl.target.darwin-arm64.mk | 5 | ||||
| -rw-r--r-- | openssl.target.darwin-mips.mk | 5 | ||||
| -rw-r--r-- | openssl.target.darwin-x86.mk | 5 | ||||
| -rw-r--r-- | openssl.target.darwin-x86_64.mk | 5 | ||||
| -rw-r--r-- | openssl.target.linux-arm.mk | 5 | ||||
| -rw-r--r-- | openssl.target.linux-arm64.mk | 5 | ||||
| -rw-r--r-- | openssl.target.linux-mips.mk | 5 | ||||
| -rw-r--r-- | openssl.target.linux-x86.mk | 5 | ||||
| -rw-r--r-- | openssl.target.linux-x86_64.mk | 5 |
10 files changed, 50 insertions, 0 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index 2b64e02..17c3ccc 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -703,6 +703,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 \ @@ -821,7 +823,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/openssl.target.darwin-arm64.mk b/openssl.target.darwin-arm64.mk index a36b4d2..0606edc 100644 --- a/openssl.target.darwin-arm64.mk +++ b/openssl.target.darwin-arm64.mk @@ -676,6 +676,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 \ @@ -776,7 +778,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/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk index f3cb1fe..462031b 100644 --- a/openssl.target.darwin-mips.mk +++ b/openssl.target.darwin-mips.mk @@ -689,6 +689,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 \ @@ -799,7 +801,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/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk index f5b6e0d..eecdde0 100644 --- a/openssl.target.darwin-x86.mk +++ b/openssl.target.darwin-x86.mk @@ -703,6 +703,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 \ @@ -821,7 +823,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/openssl.target.darwin-x86_64.mk b/openssl.target.darwin-x86_64.mk index 1fd3eae..3edb32e 100644 --- a/openssl.target.darwin-x86_64.mk +++ b/openssl.target.darwin-x86_64.mk @@ -705,6 +705,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 \ @@ -822,7 +824,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/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index 2b64e02..17c3ccc 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -703,6 +703,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 \ @@ -821,7 +823,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/openssl.target.linux-arm64.mk b/openssl.target.linux-arm64.mk index a36b4d2..0606edc 100644 --- a/openssl.target.linux-arm64.mk +++ b/openssl.target.linux-arm64.mk @@ -676,6 +676,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 \ @@ -776,7 +778,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/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk index f3cb1fe..462031b 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-mips.mk @@ -689,6 +689,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 \ @@ -799,7 +801,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/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index f5b6e0d..eecdde0 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -703,6 +703,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 \ @@ -821,7 +823,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/openssl.target.linux-x86_64.mk b/openssl.target.linux-x86_64.mk index 1fd3eae..3edb32e 100644 --- a/openssl.target.linux-x86_64.mk +++ b/openssl.target.linux-x86_64.mk @@ -705,6 +705,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 \ @@ -822,7 +824,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) |