Update makefiles after merge of Chromium at 235999
This commit was generated by merge_from_chromium.py.
Change-Id: I2ba93c0bfa807ed4f6631d0b7e5269711b05d845
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index 70b7ce7..1f6bfd1 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -171,6 +171,7 @@
third_party/openssl/openssl/crypto/buffer/buf_err.c \
third_party/openssl/openssl/crypto/buffer/buf_str.c \
third_party/openssl/openssl/crypto/buffer/buffer.c \
+ third_party/openssl/openssl/crypto/chacha/chacha_enc.c \
third_party/openssl/openssl/crypto/cmac/cm_ameth.c \
third_party/openssl/openssl/crypto/cmac/cm_pmeth.c \
third_party/openssl/openssl/crypto/cmac/cmac.c \
@@ -304,6 +305,7 @@
third_party/openssl/openssl/crypto/evp/e_aes.c \
third_party/openssl/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c \
third_party/openssl/openssl/crypto/evp/e_bf.c \
+ third_party/openssl/openssl/crypto/evp/e_chacha20poly1305.c \
third_party/openssl/openssl/crypto/evp/e_des.c \
third_party/openssl/openssl/crypto/evp/e_des3.c \
third_party/openssl/openssl/crypto/evp/e_null.c \
@@ -315,6 +317,7 @@
third_party/openssl/openssl/crypto/evp/e_xcbc_d.c \
third_party/openssl/openssl/crypto/evp/encode.c \
third_party/openssl/openssl/crypto/evp/evp_acnf.c \
+ third_party/openssl/openssl/crypto/evp/evp_aead.c \
third_party/openssl/openssl/crypto/evp/evp_cnf.c \
third_party/openssl/openssl/crypto/evp/evp_enc.c \
third_party/openssl/openssl/crypto/evp/evp_err.c \
@@ -413,6 +416,7 @@
third_party/openssl/openssl/crypto/pkcs7/pk7_smime.c \
third_party/openssl/openssl/crypto/pkcs7/pkcs7err.c \
third_party/openssl/openssl/crypto/pqueue/pqueue.c \
+ third_party/openssl/openssl/crypto/poly1305/poly1305.c \
third_party/openssl/openssl/crypto/rand/md_rand.c \
third_party/openssl/openssl/crypto/rand/rand_egd.c \
third_party/openssl/openssl/crypto/rand/rand_err.c \
@@ -571,7 +575,10 @@
third_party/openssl/openssl/crypto/aes/asm/aes-armv4.S \
third_party/openssl/openssl/crypto/bn/asm/armv4-gf2m.S \
third_party/openssl/openssl/crypto/bn/asm/armv4-mont.S \
+ third_party/openssl/openssl/crypto/chacha/chacha_vec_arm.S \
third_party/openssl/openssl/crypto/modes/asm/ghash-armv4.S \
+ third_party/openssl/openssl/crypto/poly1305/poly1305_arm.c \
+ third_party/openssl/openssl/crypto/poly1305/poly1305_arm_asm.S \
third_party/openssl/openssl/crypto/sha/asm/sha1-armv4-large.S \
third_party/openssl/openssl/crypto/sha/asm/sha256-armv4.S \
third_party/openssl/openssl/crypto/sha/asm/sha512-armv4.S
diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index 28a277e..16fdd0b 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -170,6 +170,7 @@
third_party/openssl/openssl/crypto/buffer/buf_err.c \
third_party/openssl/openssl/crypto/buffer/buf_str.c \
third_party/openssl/openssl/crypto/buffer/buffer.c \
+ third_party/openssl/openssl/crypto/chacha/chacha_enc.c \
third_party/openssl/openssl/crypto/cmac/cm_ameth.c \
third_party/openssl/openssl/crypto/cmac/cm_pmeth.c \
third_party/openssl/openssl/crypto/cmac/cmac.c \
@@ -303,6 +304,7 @@
third_party/openssl/openssl/crypto/evp/e_aes.c \
third_party/openssl/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c \
third_party/openssl/openssl/crypto/evp/e_bf.c \
+ third_party/openssl/openssl/crypto/evp/e_chacha20poly1305.c \
third_party/openssl/openssl/crypto/evp/e_des.c \
third_party/openssl/openssl/crypto/evp/e_des3.c \
third_party/openssl/openssl/crypto/evp/e_null.c \
@@ -314,6 +316,7 @@
third_party/openssl/openssl/crypto/evp/e_xcbc_d.c \
third_party/openssl/openssl/crypto/evp/encode.c \
third_party/openssl/openssl/crypto/evp/evp_acnf.c \
+ third_party/openssl/openssl/crypto/evp/evp_aead.c \
third_party/openssl/openssl/crypto/evp/evp_cnf.c \
third_party/openssl/openssl/crypto/evp/evp_enc.c \
third_party/openssl/openssl/crypto/evp/evp_err.c \
@@ -412,6 +415,7 @@
third_party/openssl/openssl/crypto/pkcs7/pk7_smime.c \
third_party/openssl/openssl/crypto/pkcs7/pkcs7err.c \
third_party/openssl/openssl/crypto/pqueue/pqueue.c \
+ third_party/openssl/openssl/crypto/poly1305/poly1305.c \
third_party/openssl/openssl/crypto/rand/md_rand.c \
third_party/openssl/openssl/crypto/rand/rand_egd.c \
third_party/openssl/openssl/crypto/rand/rand_err.c \
diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 9b93610..3616d55 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -167,6 +167,7 @@
third_party/openssl/openssl/crypto/buffer/buf_err.c \
third_party/openssl/openssl/crypto/buffer/buf_str.c \
third_party/openssl/openssl/crypto/buffer/buffer.c \
+ third_party/openssl/openssl/crypto/chacha/chacha_enc.c \
third_party/openssl/openssl/crypto/cmac/cm_ameth.c \
third_party/openssl/openssl/crypto/cmac/cm_pmeth.c \
third_party/openssl/openssl/crypto/cmac/cmac.c \
@@ -298,6 +299,7 @@
third_party/openssl/openssl/crypto/evp/e_aes.c \
third_party/openssl/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c \
third_party/openssl/openssl/crypto/evp/e_bf.c \
+ third_party/openssl/openssl/crypto/evp/e_chacha20poly1305.c \
third_party/openssl/openssl/crypto/evp/e_des.c \
third_party/openssl/openssl/crypto/evp/e_des3.c \
third_party/openssl/openssl/crypto/evp/e_null.c \
@@ -309,6 +311,7 @@
third_party/openssl/openssl/crypto/evp/e_xcbc_d.c \
third_party/openssl/openssl/crypto/evp/encode.c \
third_party/openssl/openssl/crypto/evp/evp_acnf.c \
+ third_party/openssl/openssl/crypto/evp/evp_aead.c \
third_party/openssl/openssl/crypto/evp/evp_cnf.c \
third_party/openssl/openssl/crypto/evp/evp_enc.c \
third_party/openssl/openssl/crypto/evp/evp_err.c \
@@ -407,6 +410,7 @@
third_party/openssl/openssl/crypto/pkcs7/pk7_smime.c \
third_party/openssl/openssl/crypto/pkcs7/pkcs7err.c \
third_party/openssl/openssl/crypto/pqueue/pqueue.c \
+ third_party/openssl/openssl/crypto/poly1305/poly1305.c \
third_party/openssl/openssl/crypto/rand/md_rand.c \
third_party/openssl/openssl/crypto/rand/rand_egd.c \
third_party/openssl/openssl/crypto/rand/rand_err.c \
diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index 70b7ce7..1f6bfd1 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -171,6 +171,7 @@
third_party/openssl/openssl/crypto/buffer/buf_err.c \
third_party/openssl/openssl/crypto/buffer/buf_str.c \
third_party/openssl/openssl/crypto/buffer/buffer.c \
+ third_party/openssl/openssl/crypto/chacha/chacha_enc.c \
third_party/openssl/openssl/crypto/cmac/cm_ameth.c \
third_party/openssl/openssl/crypto/cmac/cm_pmeth.c \
third_party/openssl/openssl/crypto/cmac/cmac.c \
@@ -304,6 +305,7 @@
third_party/openssl/openssl/crypto/evp/e_aes.c \
third_party/openssl/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c \
third_party/openssl/openssl/crypto/evp/e_bf.c \
+ third_party/openssl/openssl/crypto/evp/e_chacha20poly1305.c \
third_party/openssl/openssl/crypto/evp/e_des.c \
third_party/openssl/openssl/crypto/evp/e_des3.c \
third_party/openssl/openssl/crypto/evp/e_null.c \
@@ -315,6 +317,7 @@
third_party/openssl/openssl/crypto/evp/e_xcbc_d.c \
third_party/openssl/openssl/crypto/evp/encode.c \
third_party/openssl/openssl/crypto/evp/evp_acnf.c \
+ third_party/openssl/openssl/crypto/evp/evp_aead.c \
third_party/openssl/openssl/crypto/evp/evp_cnf.c \
third_party/openssl/openssl/crypto/evp/evp_enc.c \
third_party/openssl/openssl/crypto/evp/evp_err.c \
@@ -413,6 +416,7 @@
third_party/openssl/openssl/crypto/pkcs7/pk7_smime.c \
third_party/openssl/openssl/crypto/pkcs7/pkcs7err.c \
third_party/openssl/openssl/crypto/pqueue/pqueue.c \
+ third_party/openssl/openssl/crypto/poly1305/poly1305.c \
third_party/openssl/openssl/crypto/rand/md_rand.c \
third_party/openssl/openssl/crypto/rand/rand_egd.c \
third_party/openssl/openssl/crypto/rand/rand_err.c \
@@ -571,7 +575,10 @@
third_party/openssl/openssl/crypto/aes/asm/aes-armv4.S \
third_party/openssl/openssl/crypto/bn/asm/armv4-gf2m.S \
third_party/openssl/openssl/crypto/bn/asm/armv4-mont.S \
+ third_party/openssl/openssl/crypto/chacha/chacha_vec_arm.S \
third_party/openssl/openssl/crypto/modes/asm/ghash-armv4.S \
+ third_party/openssl/openssl/crypto/poly1305/poly1305_arm.c \
+ third_party/openssl/openssl/crypto/poly1305/poly1305_arm_asm.S \
third_party/openssl/openssl/crypto/sha/asm/sha1-armv4-large.S \
third_party/openssl/openssl/crypto/sha/asm/sha256-armv4.S \
third_party/openssl/openssl/crypto/sha/asm/sha512-armv4.S
diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index 28a277e..16fdd0b 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -170,6 +170,7 @@
third_party/openssl/openssl/crypto/buffer/buf_err.c \
third_party/openssl/openssl/crypto/buffer/buf_str.c \
third_party/openssl/openssl/crypto/buffer/buffer.c \
+ third_party/openssl/openssl/crypto/chacha/chacha_enc.c \
third_party/openssl/openssl/crypto/cmac/cm_ameth.c \
third_party/openssl/openssl/crypto/cmac/cm_pmeth.c \
third_party/openssl/openssl/crypto/cmac/cmac.c \
@@ -303,6 +304,7 @@
third_party/openssl/openssl/crypto/evp/e_aes.c \
third_party/openssl/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c \
third_party/openssl/openssl/crypto/evp/e_bf.c \
+ third_party/openssl/openssl/crypto/evp/e_chacha20poly1305.c \
third_party/openssl/openssl/crypto/evp/e_des.c \
third_party/openssl/openssl/crypto/evp/e_des3.c \
third_party/openssl/openssl/crypto/evp/e_null.c \
@@ -314,6 +316,7 @@
third_party/openssl/openssl/crypto/evp/e_xcbc_d.c \
third_party/openssl/openssl/crypto/evp/encode.c \
third_party/openssl/openssl/crypto/evp/evp_acnf.c \
+ third_party/openssl/openssl/crypto/evp/evp_aead.c \
third_party/openssl/openssl/crypto/evp/evp_cnf.c \
third_party/openssl/openssl/crypto/evp/evp_enc.c \
third_party/openssl/openssl/crypto/evp/evp_err.c \
@@ -412,6 +415,7 @@
third_party/openssl/openssl/crypto/pkcs7/pk7_smime.c \
third_party/openssl/openssl/crypto/pkcs7/pkcs7err.c \
third_party/openssl/openssl/crypto/pqueue/pqueue.c \
+ third_party/openssl/openssl/crypto/poly1305/poly1305.c \
third_party/openssl/openssl/crypto/rand/md_rand.c \
third_party/openssl/openssl/crypto/rand/rand_egd.c \
third_party/openssl/openssl/crypto/rand/rand_err.c \
diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 9b93610..3616d55 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -167,6 +167,7 @@
third_party/openssl/openssl/crypto/buffer/buf_err.c \
third_party/openssl/openssl/crypto/buffer/buf_str.c \
third_party/openssl/openssl/crypto/buffer/buffer.c \
+ third_party/openssl/openssl/crypto/chacha/chacha_enc.c \
third_party/openssl/openssl/crypto/cmac/cm_ameth.c \
third_party/openssl/openssl/crypto/cmac/cm_pmeth.c \
third_party/openssl/openssl/crypto/cmac/cmac.c \
@@ -298,6 +299,7 @@
third_party/openssl/openssl/crypto/evp/e_aes.c \
third_party/openssl/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c \
third_party/openssl/openssl/crypto/evp/e_bf.c \
+ third_party/openssl/openssl/crypto/evp/e_chacha20poly1305.c \
third_party/openssl/openssl/crypto/evp/e_des.c \
third_party/openssl/openssl/crypto/evp/e_des3.c \
third_party/openssl/openssl/crypto/evp/e_null.c \
@@ -309,6 +311,7 @@
third_party/openssl/openssl/crypto/evp/e_xcbc_d.c \
third_party/openssl/openssl/crypto/evp/encode.c \
third_party/openssl/openssl/crypto/evp/evp_acnf.c \
+ third_party/openssl/openssl/crypto/evp/evp_aead.c \
third_party/openssl/openssl/crypto/evp/evp_cnf.c \
third_party/openssl/openssl/crypto/evp/evp_enc.c \
third_party/openssl/openssl/crypto/evp/evp_err.c \
@@ -407,6 +410,7 @@
third_party/openssl/openssl/crypto/pkcs7/pk7_smime.c \
third_party/openssl/openssl/crypto/pkcs7/pkcs7err.c \
third_party/openssl/openssl/crypto/pqueue/pqueue.c \
+ third_party/openssl/openssl/crypto/poly1305/poly1305.c \
third_party/openssl/openssl/crypto/rand/md_rand.c \
third_party/openssl/openssl/crypto/rand/rand_egd.c \
third_party/openssl/openssl/crypto/rand/rand_err.c \
