diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-01-02 15:18:09 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-01-02 15:18:09 +0000 |
| commit | 8c5a5256a96176d9184de2c40b86b01dacdee4a8 (patch) | |
| tree | aedcc0c9c46392fa983923409924e2b44aae2ecf | |
| parent | ac44adde619a88335f07a832bd8e918fc4fea7a4 (diff) | |
| parent | fe46ce2574ea55273ae9bf4de6edc6ddeed5a428 (diff) | |
| download | openssl-kitkat-dev.tar.gz | |
Merge from Chromium at DEPS revision 241107android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1kitkat-mr2-releasekitkat-dev
This commit was generated by merge_to_master.py.
Change-Id: I0650a599f040a43b4bbe12206ee790bbede3b356
| -rw-r--r-- | openssl.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | openssl.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | openssl.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-x86.mk | 2 |
6 files changed, 0 insertions, 12 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index bc4b26f..5361f7e 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -622,7 +622,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -724,7 +723,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk index 7115710..81cebdd 100644 --- a/openssl.target.darwin-mips.mk +++ b/openssl.target.darwin-mips.mk @@ -616,7 +616,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -715,7 +714,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk index 26943ad..9373fc2 100644 --- a/openssl.target.darwin-x86.mk +++ b/openssl.target.darwin-x86.mk @@ -624,7 +624,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -735,7 +734,6 @@ MY_CFLAGS_Release := \ -fno-asynchronous-unwind-tables MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index bc4b26f..5361f7e 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -622,7 +622,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -724,7 +723,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk index 7115710..81cebdd 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-mips.mk @@ -616,7 +616,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -715,7 +714,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index 26943ad..9373fc2 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -624,7 +624,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -735,7 +734,6 @@ MY_CFLAGS_Release := \ -fno-asynchronous-unwind-tables MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ |