aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "curl_config.h: Update the default CA certificates path."HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0Bertrand Simonnet2015-08-131-1/+1
|\
| * curl_config.h: Update the default CA certificates path.Bertrand SIMONNET2015-08-131-1/+1
|/ | | | | | | | | | In Android, the CA certificates are installed in /system/etc/security/cacerts. BUG: 23016355 TEST: curl https://www.google.com works. Change-Id: I1c70f035e9a2cd491fb7e9eb95afa06de0ae5c16
* Merge "curl: Fix imported/exported includes."Bertrand Simonnet2015-07-241-4/+4
|\
| * curl: Fix imported/exported includes.Bertrand SIMONNET2015-07-241-4/+4
|/ | | | | | | | | | Set the right library dependencies for libcurl_static to remove the need to manually specify the include paths for boringssl and libz. Also export the headers for both libraries. (cherry-pick of 7f7d02b5cd37ccf025b14837d6d4695275588bf4.) Change-Id: I3da348bfa98569450b1f845302accabd8017ca27
* Merge "Add Android.mk that builds libcurl."Bertrand SIMONNET2015-07-171-0/+75
|\
| * Add Android.mk that builds libcurl.Bertrand SIMONNET2015-07-091-0/+75
| | | | | | | | | | | | | | | | This is a cleaned up version of the original Android.mk file which was meant to handle an old version of android. BUG: 22347561 Change-Id: I350789fe802f22c1a5fa6931c50b6359bb731ab9
* | Merge "Add generated configuration files."Bertrand SIMONNET2015-07-165-3/+1199
|\|
| * Add generated configuration files.Bertrand SIMONNET2015-07-095-3/+1199
| | | | | | | | | | | | | | | | | | | | | | This adds configurations files generated by the configure script and remove them from the .gitignores. Those files should stay constant for all configuration and developers should not have to run the configure script themselves. BUG: 22347561 Change-Id: I90298082ac7f21055fa4a4a18850c3298cfbf53d
* | Merge "Don't rely on hardcoded type size."Bertrand SIMONNET2015-07-166-145/+16
|\|
| * Don't rely on hardcoded type size.Bertrand SIMONNET2015-07-096-145/+16
| | | | | | | | | | | | | | | | | | | | Instead of hard coding the type size computed in configure (which prevents cross compilation), use either the type sizes defined by bionic or sizeof instruction. BUG: 22347561 Change-Id: Ia1d8ba914e2f410754d0bd49618956d19d517d25
* | Merge "configure.ac: Fix boringssl detection."Bertrand SIMONNET2015-07-161-6/+14
|\|
| * configure.ac: Fix boringssl detection.Bertrand SIMONNET2015-07-091-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | BoringSSL changed since curl started supporting it. In particular: * crypto.h does not contain CRYPTO_add_lock anymore. - replaced by a check for SSLeay. * BoringSSL added DES_set_odd_parity back. - replaced by a check for OPENSSL_IS_BORINGSSL being defined. BUG: 22347561 Change-Id: Idd0abe6d57177faded92a6150a1f6d1f4009a74b
* | Merge "Add script to generate the build configuration."Bertrand SIMONNET2015-07-161-0/+36
|\|
| * Add script to generate the build configuration.Bertrand SIMONNET2015-07-091-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On a standard linux install, the configure script will generate header files enabling/disabling features based on the system's configuration. On android, we don't want to use the host configuration and need to wrap that call with the right build parameters (CFLAGS, LDFLAGS, etc) in order to generate the right configuration. Note: this script should be run everytime we update curl. BUG: 22347561 Change-Id: Icd44dbd35daa811e16f327fc4ec23f0cbe1d8780
* | Merge "Add MODULE_LICENSE_MIT file."Bertrand SIMONNET2015-07-161-0/+0
|\|
| * Add MODULE_LICENSE_MIT file.Bertrand SIMONNET2015-07-091-0/+0
| | | | | | | | Change-Id: Ie7391b502f290096d1388d867fd2816a71647c76
* | Merge "curl: Symlink the copyright as NOTICE."Bertrand SIMONNET2015-07-101-0/+1
|\|
| * curl: Symlink the copyright as NOTICE.Bertrand SIMONNET2015-07-091-0/+1
| | | | | | | | | | | | | | | | Android looks for a NOTICE file to generate the licenses information. BUG: 22347561 Change-Id: I11cc854290966b34fe517ed1b549b982c8f16d89
* | Merge "curl: fix build with BoringSSL"Bertrand Simonnet2015-07-101-0/+5
|\|
| * curl: fix build with BoringSSLDaniel Stenberg2015-07-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | OPENSSL_load_builtin_modules does not exist in BoringSSL. Regression from cae43a1 This change was cherry-picked from upstream at 46d0eba2e9f600972c56bde04357bb5cfe1bc42b. BUG: 22347561 Change-Id: I22883e923481b79ee61cbce3df312f9478ea16db
* | Merge "Import curl 7.43"Bertrand SIMONNET2015-07-102162-157877/+235885
|\|
| * Import curl 7.43Bertrand SIMONNET2015-07-082162-157877/+235885
|/ | | | | | | | | | This is a simple import of curl 7.43. The only change from the official release is the fact that the Android.mk was removed to avoid build error trying to parse it. BUG: 22347561 Change-Id: I52ef6798d30b25d22d1f62770d571adec8bcf4d5
* Update curl paths in Mac build script.Lucas Eckels2012-08-141-3/+3
| | | | Change-Id: I162dabc11344718284ec9d6efcb6bed1670d6a1b
* Update curl Window project for renamed dep pathLucas Eckels2012-08-101-2/+2
| | | | Change-Id: I9d9270928229fa962591018839beb4c1cd756cd1
* Add Music Manager's curl 7.21.2 source.Lucas Eckels2012-08-081295-7072/+232017
| | | | Change-Id: I259a43fa52d581524a5ce8ae1711467acb1d9d50
* Initial empty repositoryChad Jones2012-07-300-0/+0
|
* Fix for bug 3341506Kristian Monsen2011-02-251-0/+9
| | | | Change-Id: I1c2ec44fd9536f62101ddfeedfa632dde6975b11
* Add missing NOTICE files.David Deephanphongs2010-10-193-0/+63
| | | | | | | Add missing NOTICE file, and copy into subdirectories where it will be picked up by the build system. Change-Id: I726e6a0a1814d7a6c7508a1537ec35fbe0aceeb7
* Initial check in of curl.Kristian Monsen2010-05-17217-0/+93548
| | | | | | | | Plan to: - Fix warnings - Add java support Change-Id: Ia61d4d479aa61178f2883161491ab844301317e0
* new project, first commitNico Sallembien2010-05-100-0/+0