summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-27Merge WebView M40 build 1832189 into AOSP.HEADandroid-m-preview-2android-m-preview-1mastermainTorne (Richard Coles)
2014-12-05Temporarily disable -Werror in Chromium.android-m-previewmaster-soongTorne (Richard Coles)
Temporarily disable the use of -Werror in the AOSP copy of Chromium so that the system-wide default warnings can be changed without breaking Chromium. We'll re-enable it once the warnings are settled and we've fixed any issues. Bug: 18632512 Change-Id: Ib1f567ccdd36f7c4ede6da2092303af9a9ac96f5
2014-11-06Merge from Chromium at DEPS revision db3f05efe0f9webview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1ub-webview-m40-releaseTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I09239f19b37a127faf87261e2b67445d21960882
2014-11-05Update makefiles after merge of Chromium at 5a645aa13b82Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ide25481679da357158153339739538a844e4729d
2014-11-05Update makefiles after merge of Chromium at 2d0da5605d75Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Idf33618d369728ffd0e5bd96eef41d5a08e11bcf
2014-11-04Update makefiles after merge of Chromium at a99b7ad25d02Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I0bead36c8928faaddb9df8669c3fd7e3e3d2d7d9
2014-10-31Update makefiles after merge of Chromium at a41c404b1c7fAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Id51dbf8b3b3a5ea4a97835860186f58f152c0ae4
2014-10-31Update makefiles after merge of Chromium at b210e2d62956Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I0967fe69e9cd230252798b4f2c8bdae8237f35ab
2014-10-28Update makefiles after merge of Chromium at d7fee8e7dd15Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I23f1c4e469e9a406880ff05cb3d03dd22a9b0dd3
2014-10-28Merge third_party/libsrtp from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libsrtp.git at 6446144c7f083552f21cc4e6768e891bcb767574 This commit was generated by merge_from_chromium.py. Change-Id: I9f4ba21329b91e8568a6b7cf728399a8d74728b3
2014-10-28[MIPS] Define 'CPU_CISC' for mips as aes calculation is incorrect for 'CPU_RISC'Gordana.Cmiljanovic@imgtec.com
Review URL: https://codereview.chromium.org/639123008 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libsrtp@292694 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-10-28Update makefiles after merge of Chromium at 82ca3b654cdaAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I1914afc3bbfacffb966e41b8e591cafc0fcfc790
2014-10-27Merge from Chromium at DEPS revision 614f7b807940Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I3044a8c395f90c9e4a4065aff43985ae9eeb81b7
2014-10-23Update makefiles after merge of Chromium at 9ef958e74e13Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: If150222ee6005ffcdfa5e917d3ef7f2f9d26dbd2
2014-10-19Update makefiles after merge of Chromium at 89b463ddd92bAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I23eadaa119a751c389e7e2b91039b7256a6e3895
2014-10-15Update makefiles after merge of Chromium at 6e9c84566c9fAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I1c8a8cfb8ff23263959c9107757c172bed820fa6
2014-09-30Update makefiles after merge of Chromium at 9c6ac85c45faAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I8e3723b859615769ffe94f881caa06e4ebb34f84
2014-09-30Merge from Chromium at DEPS revision 267aeeb8d85cPrimiano Tucci
This commit was generated by merge_to_master.py. Change-Id: I665cd5f3cf00ca7782d5114c4c4de9f4645addff
2014-09-22Update makefiles after merge of Chromium at 7b0ec7dd4a37Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I384e21b0491c179f6108839381a480808e03e3a1
2014-09-22Merge third_party/libsrtp from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libsrtp.git at 98284c8600c73812ff4716a6ea157d1e11d417dc This commit was generated by merge_from_chromium.py. Change-Id: I8b474cb15707650e0e2ab4ea5afd07917f18f292
2014-09-22Use FORCE_64BIT_ALIGN on 32-bit platforms to make sure that aes_cbc_ctx_t ↵jiayl@chromium.org
allocated by aes_cbc_alloc is 64-bit aligned. BUG=414919 R=sergeyu@chromium.org Review URL: https://codereview.chromium.org/592173002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libsrtp@292077 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-22Update makefiles after merge of Chromium at fb34b348eeadAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia1db783fbc6613f541dfdd229907ce8e0588afef
2014-09-19Revert r292047: Replace compiling flag "-O3" with "-O2" to avoid a compiler ↵jiayl@chromium.org
bug that caused a crash TBR=sergeyu@chromium.org BUG=414919 Review URL: https://codereview.chromium.org/588703002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libsrtp@292049 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-19Replace compiling flag "-O3" with "-O2" to avoid a compiler bug that caused ↵jiayl@chromium.org
a crash. TBR=sergeyu@chromium.org BUG=414919 Review URL: https://codereview.chromium.org/589623002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libsrtp@292047 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-13Update makefiles after merge of Chromium at 6a4d455b8650Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I1795bb36cd59bc740a3d55d60849561e7e5f1420
2014-09-11Update makefiles after merge of Chromium at b62471bd5180Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I109cfdb89708cb5ccbf5d9fada2be50407a1bebc
2014-09-10Update makefiles after merge of Chromium at a301aef21f9eAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I31206ce3409533d573a854a6d3f39bc53e1235a7
2014-09-10Update makefiles after merge of Chromium at d0b993bb2548Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I21f94c65259e33f81241d91219d55cfb883fee6f
2014-09-09Update makefiles after merge of Chromium at facf66e09bf8Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Idebb4d45d768674d942fb76b3f0c13339d58192e
2014-09-09Update makefiles after merge of Chromium at 457b0a1c9412Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia5d9d6271f693ea54779045d0e710e407e5f985d
2014-09-05Merge third_party/libsrtp from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libsrtp.git at dcc1fc62771b4f25fa5f91cddec8e9a491d0ee6d This commit was generated by merge_from_chromium.py. Change-Id: I49348face45e38650cfe7adb528cd1fa5e24b2eb
2014-09-05Revert "Define DEV_URANDOM for posix"michaelbai@chromium.org
This reverts commit 401b2cc8125bc7504f9dfef61ca7955550d361c1. This broke linux-gpu etc. bot BUG= Review URL: https://codereview.chromium.org/541263002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libsrtp@291813 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-08-27Update makefiles after merge of Chromium at b241671f0248Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I08249061401acea13b9a48948da802663055b113
2014-08-19Merge from Chromium at DEPS revision 290040android-wear-5.1.1_r1android-wear-5.1.0_r1Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ia3139b135aa9dc6d45b89d210f164209c79ea4a5
2014-08-12Merge from Chromium at DEPS revision 288042Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I065c6d530d371a2c0348f1dc1fcf82137b64c27d
2014-08-12Update makefiles after merge of Chromium at 288938Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Id37cf2b497cb53506f60facb1eb99f0b5fe39ff2
2014-08-07[MIPS] Add build support for MIPS64 in libsrtp.mallinath@chromium.org
BUG=400684 Review URL: https://codereview.chromium.org/447273002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libsrtp@288046 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-07-29Update makefiles after merge of Chromium at 286177Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ic1aab800a375cfd6964367c11c451c7d8b52ca92
2014-07-23Define DEV_URANDOM for posixmichaelbai@chromium.org
It seemed that Android, Linux and MacOS support /dev/random. Enable it for OS_POSIX. BUG=393774 R=juberti@chromium.org Review URL: https://codereview.chromium.org/392783005 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libsrtp@284994 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-07-20Merge from Chromium at DEPS revision 284076Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I404bf54b087ddac7e6d12e59c263c25697bc0d1c
2014-07-18Merge third_party/libsrtp from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libsrtp.git at 662d81de5cbf3667f1baaafe051b8b4ab0b12fe2 This commit was generated by merge_from_chromium.py. Change-Id: I228102856110fba75530b2ffa9e463acb75967d2
2014-07-16[MIPS] Make srtp_driver compile for MIPSmallinath@chromium.org
Rename local variable 'mips' to 'mips_value' as 'mips' is already defined by MIPS version of gcc. TEST=make srtp_driver Review URL: https://codereview.chromium.org//399683002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libsrtp@283418 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-07-10Update makefiles after merge of Chromium at 282385Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ibab3f7cb4f79ed21f3be7bf6c6045df187650af9
2014-06-25Update makefiles after merge of Chromium at 279716Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia5fd342d5196dfd92410a9274b22a1bf62008f10
2014-06-25Merge from Chromium at DEPS revision 278856Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I62a08376cdbd3239accbd8ae137a9caf603ae65b
2014-06-20Merge from Chromium at DEPS revision 278205Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Iabd636d9f02be0b2aa1da9912eddb0f28f864124
2014-06-19Update makefiles after merge of Chromium at 278252Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ibf6d6eded4ac7e9d71720618237e706866310d40
2014-06-16Update makefiles after merge of Chromium at 277428Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia4bf8a9cdd4c1d3fb5dd9f4e9c036202292de5cb
2014-06-10Update makefiles after merge of Chromium at 276202Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Iadafe28ff293db20441b252ffec7b01ddffab58f
2014-06-09Update makefiles after merge of Chromium at 275833Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I380c1dfd526f2bc84cce41108d6b1585dd330b85