aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Mark ab/7061308 as merged in stage.HEADandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseemu-master-devandroid-s-beta-5android-s-beta-4Xin Li2021-02-200-0/+0
|\
| * Mark ab/6881855 as merged am: 835b8620c7Xin Li2020-11-240-0/+0
| |\
| * \ Merge "Add fuzz target for libsrtp2's fuzzer" am: fdf3b79eed am: a90aa04675 a...Treehugger Robot2020-10-201-0/+22
| |\ \
| | * \ Merge "Add fuzz target for libsrtp2's fuzzer" am: fdf3b79eed am: a90aa04675Treehugger Robot2020-10-201-0/+22
| | |\ \
| * | | | [automerger skipped] Skip ab/6749736 in stage. am: 6d7aef8f77 -s ours am: 752...Xin Li2020-10-090-0/+0
| |\| | |
| | * | | [automerger skipped] Skip ab/6749736 in stage. am: 6d7aef8f77 -s oursXin Li2020-10-090-0/+0
| | |\ \ \
* | | \ \ \ [LSC] Add LOCAL_LICENSE_KINDS to external/libsrtp2 am: f39d4199d6Bob Badour2021-02-171-0/+31
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | [LSC] Add LOCAL_LICENSE_KINDS to external/libsrtp2android-s-preview-1Bob Badour2021-02-121-0/+31
|/ / / / /
* | | | / Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
|\| | | | | |_|_|/ |/| | |
| * | | Mark libsrtp2 as vendor module am: 1915e687eb am: a883cd4301 am: 0eb130624d a...Harish Mahendrakar2020-10-011-0/+6
| |\| |
| | * | Mark libsrtp2 as vendor module am: 1915e687eb am: a883cd4301 am: 0eb130624dHarish Mahendrakar2020-10-011-0/+6
| | |\ \
| | | * \ Mark libsrtp2 as vendor module am: 1915e687eb am: a883cd4301Harish Mahendrakar2020-10-011-0/+6
| | | |\ \
| * | | | | Export the include paths am: d8f04c502b am: f6ed0df57c am: 3298dd5e82 am: 522...Jorge E. Moreira2020-07-151-0/+2
| |\| | | |
| * | | | | Add METADATA to libsrtp2: BSD+MIT=NOTICE am: 91e048d818 am: 84adc12cf9 am: 37...Bob Badour2020-04-301-0/+3
| |\ \ \ \ \
* | \ \ \ \ \ Merge "Add fuzz target for libsrtp2's fuzzer" am: fdf3b79eedTreehugger Robot2020-10-201-0/+22
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge "Add fuzz target for libsrtp2's fuzzer"Treehugger Robot2020-10-201-0/+22
|/| | | | | |
| * | | | | | Add fuzz target for libsrtp2's fuzzerBranden Archer2020-10-151-0/+22
* | | | | | | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Export the include paths am: d8f04c502b am: f6ed0df57c am: 3298dd5e82Jorge E. Moreira2020-07-151-0/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| * | | | Add METADATA to libsrtp2: BSD+MIT=NOTICE am: 91e048d818 am: 84adc12cf9 am: 37...Bob Badour2020-04-301-0/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Mark libsrtp2 as vendor module am: 1915e687ebHarish Mahendrakar2020-10-011-0/+6
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Mark libsrtp2 as vendor moduleHarish Mahendrakar2020-09-291-0/+6
|/ / /
* | | Export the include paths am: d8f04c502b am: f6ed0df57cJorge E. Moreira2020-07-151-0/+2
|\ \ \ | |_|/ |/| |
| * | Export the include paths am: d8f04c502bJorge E. Moreira2020-07-151-0/+2
| |\ \
| | * | Export the include pathsJorge E. Moreira2020-07-141-0/+2
| |/ /
* | / Add METADATA to libsrtp2: BSD+MIT=NOTICE am: 91e048d818 am: 84adc12cf9Bob Badour2020-04-301-0/+3
|\| | | |/ |/|
| * Add METADATA to libsrtp2: BSD+MIT=NOTICE am: 91e048d818android-r-beta-3android-r-beta-2Bob Badour2020-04-301-0/+3
|/|
| * Add METADATA to libsrtp2: BSD+MIT=NOTICEBob Badour2020-04-291-0/+3
|/
* Merge remote-tracking branch 'goog/qt-gsi'platform-tools-30.0.1platform-tools-30.0.0platform-tools-29.0.6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r1android-security-11.0.0_r1android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r4android-platform-11.0.0_r3android-platform-11.0.0_r2android-platform-11.0.0_r10android-platform-11.0.0_r1android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r5android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r4android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r3android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r25android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r2android-11.0.0_r19android-11.0.0_r18android-11.0.0_r17android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-platform-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseandroid10-gsiJorge E. Moreira2019-12-172412-28607/+42683
|\
| * Enable libsrtp2 on the device.Andreas Huber2019-09-161-1/+2
| * Adds missing config.h file, conveniently hidden by local .gitignore...Andreas Huber2019-08-201-0/+197
| * Build libsrtp2 using the Android build system.Andreas Huber2019-08-202-0/+37
| * Merge remote-tracking branch 'goog/upstream-master' into importAndreas Huber2019-08-202366-0/+50834
| |\
| | * Merge pull request #459 from xhaakon/msvc-buildPascal Bühler2019-08-067-35/+61
| | |\
| | | * support building shared library on windowsPascal Bühler2019-08-067-35/+55
| | | * Add missing symbols to export into srtp.defJakub Adam2019-07-231-0/+6
| | |/
| | * Merge pull request #456 from pabuhler/vc2010-supportPascal Bühler2019-07-185-17/+20
| | |\
| | | * if inline is not supported check for __inlinePascal Bühler2019-07-112-2/+10
| | | * remove support for rand_s in testsPascal Bühler2019-07-101-14/+0
| | | * compile some tests with vc2010Pascal Bühler2019-07-102-3/+4
| | | * Add cmake check for inlinePascal Bühler2019-07-102-0/+8
| | * | Merge pull request #457 from Sean-Der/masterPascal Bühler2019-07-122-15/+15
| | |\ \ | | | |/ | | |/|
| | | * Fix docs crypto_policy_* -> srtp_crypto_policy_*Sean DuBois2019-07-112-15/+15
| | |/
| | * Merge pull request #455 from pabuhler/cmake-supportPascal Bühler2019-07-104-58/+291
| | |\
| | | * When using cmake generate config.h into CMAKE_CURRENT_BINARY_DIRPascal Bühler2019-07-092-2/+9
| | | * add missing check for endianness with CMakePascal Buhler2019-07-082-0/+7
| | | * Update cmake to support most of the options available with configurePascal Bühler2019-07-084-59/+267
| | | * add windows build to travis using cmakePascal Bühler2019-07-081-0/+11
| | |/
| | * Merge pull request #452 from hbakken/work/reset-cipher-ctx-before-reusePascal Bühler2019-07-042-0/+2
| | |\
| | | * Use EVP_CIPHER_CTX_cleanup insteadPascal Bühler2019-07-022-2/+2