summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-06-24 10:47:53 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-06-24 10:47:53 +0000
commitd3e8a9a60c21beef1bebfa1e6097b3b4b2f02d13 (patch)
tree273e26ba42c00d2c69bed820c0cc6ed5a449c43e
parent8e2428f3ad6a1866885fad72aa38a82f629c367c (diff)
downloadopenssl-d3e8a9a60c21beef1bebfa1e6097b3b4b2f02d13.tar.gz
Update makefiles after merge of Chromium at r208191
This commit was generated by merge_from_chromium.py. Change-Id: I1dce01c4f3193ac380bb0901a7cb71f8587eec25
-rw-r--r--openssl.target.darwin-arm.mk1
-rw-r--r--openssl.target.darwin-mips.mk1
-rw-r--r--openssl.target.darwin-x86.mk1
-rw-r--r--openssl.target.linux-arm.mk1
-rw-r--r--openssl.target.linux-mips.mk1
-rw-r--r--openssl.target.linux-x86.mk1
6 files changed, 6 insertions, 0 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index f5fa163..7b54d4a 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -617,6 +617,7 @@ MY_CFLAGS := \
MY_CFLAGS_C :=
MY_DEFS := \
+ '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index 90e78a5..ce56293 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -617,6 +617,7 @@ MY_CFLAGS := \
MY_CFLAGS_C :=
MY_DEFS := \
+ '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 243ab58..65d9cba 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -622,6 +622,7 @@ MY_CFLAGS := \
MY_CFLAGS_C :=
MY_DEFS := \
+ '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index f5fa163..7b54d4a 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -617,6 +617,7 @@ MY_CFLAGS := \
MY_CFLAGS_C :=
MY_DEFS := \
+ '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index 90e78a5..ce56293 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -617,6 +617,7 @@ MY_CFLAGS := \
MY_CFLAGS_C :=
MY_DEFS := \
+ '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 243ab58..65d9cba 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -622,6 +622,7 @@ MY_CFLAGS := \
MY_CFLAGS_C :=
MY_DEFS := \
+ '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \