aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10453563 from 5dc6cb253ed0f313cededbdb0932be2c73032bad to ↵aml_ext_341716000aml_ext_341620040aml_ext_341518010aml_ext_341414010aml_ext_341317010aml_ext_341131030aml_ext_341027030android14-mainline-extservices-releaseAndroid Build Coastguard Worker
mainline-extservices-release Change-Id: I0cba247a218d1ab7222915ab41d50d9b22f56220
2022-08-09Revert^2 "Updated the way we build AFL++ fuzz binaries" am: 94f281830b am: ↵HEADandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseCory Barker
ce4b33186a am: 2e3adfbb01 am: aee836f213 am: 5c43122226 Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2177767 Change-Id: Iac2ed0035107b95873dc7ebe558a36b4847313e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09Revert^2 "Updated the way we build AFL++ fuzz binaries" am: 94f281830b am: ↵android-u-beta-1-gplmain-16k-with-phonesCory Barker
ce4b33186a am: 2e3adfbb01 am: aee836f213 Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2177767 Change-Id: Ie8d52f842b11ba95ef3f137057063b2924ab4b0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09Revert^2 "Updated the way we build AFL++ fuzz binaries" am: 94f281830b am: ↵Cory Barker
ce4b33186a am: 2e3adfbb01 Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2177767 Change-Id: I6ca5d965560c8de681c37272e1ee3e5f3f535fe6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09Revert^2 "Updated the way we build AFL++ fuzz binaries" am: 94f281830b am: ↵Cory Barker
ce4b33186a Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2177767 Change-Id: I2e965432b2f5da1c8566523ed64656706770033f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09Revert^2 "Updated the way we build AFL++ fuzz binaries" am: 94f281830bmain-16kCory Barker
Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2177767 Change-Id: I9948a2c460d69b12c03575b4636a0308243604f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08Revert "Updated the way we build AFL++ fuzz binaries" am: d2ebbfd4b4 am: ↵Cory Barker
3de2daf51b am: a3a49f8a01 am: 487c118a87 am: ac9b1d7be7 Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2177926 Change-Id: I9ddcf25e00996f77d60b96128276dfa795d6ec58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08Revert "Updated the way we build AFL++ fuzz binaries" am: d2ebbfd4b4 am: ↵Cory Barker
3de2daf51b am: a3a49f8a01 am: 487c118a87 Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2177926 Change-Id: I6809ea47e56ff0baed7e3171723b1e9f712f0ee5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08Revert "Updated the way we build AFL++ fuzz binaries" am: d2ebbfd4b4 am: ↵Cory Barker
3de2daf51b am: a3a49f8a01 Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2177926 Change-Id: I1d75b1c394f5e23926dacd2987d35ee76d950b9f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08Revert "Updated the way we build AFL++ fuzz binaries" am: d2ebbfd4b4 am: ↵Cory Barker
3de2daf51b Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2177926 Change-Id: Ifa69a3403f0dc6c830275edd2b81e7f6adab24d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08Revert "Updated the way we build AFL++ fuzz binaries" am: d2ebbfd4b4Cory Barker
Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2177926 Change-Id: I8bdddb2afb080f46884b5009e77a38e1bd49e78e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08Revert^2 "Updated the way we build AFL++ fuzz binaries"Cory Barker
d2ebbfd4b48f2e053c5eac2c06b6b9f600218568 Change-Id: I0395712912d52f870820117d020f713e929c21f4
2022-08-08Updated the way we build AFL++ fuzz binaries am: 5e3d1e4c31 am: b3f09ef355 ↵Cory Barker
am: 082ae95f14 am: 14c1253318 am: d8b0c050cf Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2162783 Change-Id: I7484aef0ab1bcc5d73298276593a811806828947 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08Updated the way we build AFL++ fuzz binaries am: 5e3d1e4c31 am: b3f09ef355 ↵Cory Barker
am: 082ae95f14 am: 14c1253318 Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2162783 Change-Id: I736ebff42ab7c3ca70cf7ca286bf89dcaff0392c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08Updated the way we build AFL++ fuzz binaries am: 5e3d1e4c31 am: b3f09ef355 ↵Cory Barker
am: 082ae95f14 Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2162783 Change-Id: Ic288f151beaeeb54d364aba03db9cd1f0ce9d6a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08Revert "Updated the way we build AFL++ fuzz binaries"Cory Barker
Revert "Updated the way we build AFL++ fuzz binaries" Revert "Updated the way we build AFL++ fuzz binaries" Revert submission 2164482-Build AFL from Command line option Reason for revert: Unit test fails on MAC builds Reverted Changes: Ia7a822462:Updated the way we build AFL++ fuzz binaries I994bde63b:Updated the way we build AFL++ fuzz binaries Ie863853b4:Updated the way we build AFL++ fuzz binaries I577d6ae7b:Updated the way we build AFL++ fuzz binaries Ic4fd34f8d:Updated the way we build AFL++ fuzz binaries Change-Id: I2a2cfac39c2ebc8a3ba6f661b86fa4eed24517a5
2022-08-08Updated the way we build AFL++ fuzz binaries am: 5e3d1e4c31 am: b3f09ef355Cory Barker
Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2162783 Change-Id: If4bffb0b28e46389886d0670c339880d098cdf67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08Updated the way we build AFL++ fuzz binaries am: 5e3d1e4c31Cory Barker
Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/2162783 Change-Id: I18f43f2338049a18766d39b653d4c7acb5068121 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02Updated the way we build AFL++ fuzz binariesCory Barker
Test: Built AFL fuzzers individually and built all using haiku command and built libfuzzers individually and also by using haiku command. Ran selected fuzzers manually to ensure fuzzing still worked. Description: Previously we needed to add cc_afl_fuzz to build an afl fuzz binary, however, to turn current libFuzzers into AFL fuzzers this would required an update to each Android.bp file which is a lot of work, and would also require an approval from each Android.bp file owner, which is even more work. To get around this (and also to match how AFL fuzzers are built in G3) we will build AFL++ fuzz binaries by command line option FUZZ_FRAMEWORK. When FUZZ_FRAMEWORK=AFL is set, all cc_fuzz modules will be built Change-Id: Ic4fd34f8d5cf5cfa7db6c00235efdb230190da35
2022-05-10Snap for 8564071 from d9445df4699b59fb6b9107dbf52f5a20d8126c49 to ↵aml_ext_331814220aml_ext_331412000aml_ext_331312000aml_ext_331112010aml_ext_331012020android13-mainline-extservices-releaseAndroid Build Coastguard Worker
mainline-extservices-release Change-Id: I373f01b084991e0f57f193a3c1631e2505af089f
2021-06-21Snap for 7478067 from 7f710d0066c776c967baf2ab3c8a0ad00719a96a to ↵android-mainline-12.0.0_r9android-mainline-12.0.0_r87android-mainline-12.0.0_r72android-mainline-12.0.0_r44android-mainline-12.0.0_r27android-mainline-12.0.0_r117android-mainline-12.0.0_r102android12-mainline-extservices-releaseandroid-build-team Robot
mainline-extservices-release Change-Id: I071ae5d8e848547aa5743878e268399389aedf84
2021-06-02Merge sc-mainline-prodt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Xin Li
Bug: 189946434 Change-Id: Icd5fe8c514a3d291fb066d9ce2bd722d0c96c82a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: b054ccfb12 -s ↵Xin Li
ours am: 8ff5a45afa -s ours am: 63937cec5c -s ours am skip reason: Change-Id Ica5b998f99005ac80313f66a2781525398c26de9 with SHA-1 062badd57a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id31e5c5373c57deaf09a483c21c30df399277686
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: b054ccfb12 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: 8ff5a45afa -s ours am: 63937cec5c -s ours am skip reason: Change-Id Ica5b998f99005ac80313f66a2781525398c26de9 with SHA-1 062badd57a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iacb27443814f988c31435df4685ad5a320e18961
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: b054ccfb12 -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: 8ff5a45afa -s ours am skip reason: Change-Id Ica5b998f99005ac80313f66a2781525398c26de9 with SHA-1 062badd57a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6961f3628194fc8b94da8cb2e8b6b0eee2953d0f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: b054ccfb12 -s oursXin Li
am skip reason: Change-Id Ica5b998f99005ac80313f66a2781525398c26de9 with SHA-1 062badd57a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7501fbc4e034f93d43a09829fb51eb31a47aa407
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1emu-master-devandroid-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Ica5b998f99005ac80313f66a2781525398c26de9 Change-Id: I22c89225f8c9d70b89cfe7dcf488e8d55c603ede
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libsrtp2 am: f39d4199d6 am: ↵Bob Badour
c75fd50df4 am: 3d7aa0578a am: 0a7c3ab70c Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/1588161 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If98322c7ac9357179c847070e6e53fb6775e87a1
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libsrtp2 am: f39d4199d6 am: ↵Bob Badour
c75fd50df4 am: 3d7aa0578a am: 0a7c3ab70c Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/1588161 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ief2f1d422076d241a9f153e39484b78524ce3098
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libsrtp2 am: f39d4199d6 am: ↵Bob Badour
c75fd50df4 am: 3d7aa0578a Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/1588161 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ied67bc761a923b50dc8203b1ea8d51432af26567
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libsrtp2 am: f39d4199d6 am: c75fd50df4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/1588161 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7749bc52efb2803ca298aca180fa460e26f9c35e
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libsrtp2 am: f39d4199d6Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/1588161 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I05338f292671a91608320e150a274e6faf3d17d8
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libsrtp2android-s-preview-1Bob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I86842132e77dde73a3d2cc44a14b57198e26bfce
2020-11-24Mark ab/6881855 as merged am: 835b8620c7 am: 062badd57aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libsrtp2/+/13111713 Change-Id: Ia140f40277467909107d828d71fa65369254f000
2020-11-24Mark ab/6881855 as merged am: 835b8620c7Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libsrtp2/+/13111713 Change-Id: Ica5b998f99005ac80313f66a2781525398c26de9
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I48a53579b7882080fdf1d02dc342fe9a6261003b
2020-10-20Merge "Add fuzz target for libsrtp2's fuzzer" am: fdf3b79eed am: a90aa04675 ↵Treehugger Robot
am: a66ea4eeef am: eb528ef5ce Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/1462968 Change-Id: I5b8a292d6186eea092fd5c4785ee8102ea6a13fc
2020-10-20Merge "Add fuzz target for libsrtp2's fuzzer" am: fdf3b79eed am: a90aa04675 ↵Treehugger Robot
am: a66ea4eeef Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/1462968 Change-Id: I39502b42a0d12f325ae53b6e66a47904290ba73e
2020-10-20Merge "Add fuzz target for libsrtp2's fuzzer" am: fdf3b79eed am: a90aa04675Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/1462968 Change-Id: I390fa959322481d2c773243bbbd449e24fe21379
2020-10-20Merge "Add fuzz target for libsrtp2's fuzzer" am: fdf3b79eedTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/1462968 Change-Id: I2c397924fc72af55aa9d4c13ce0100f0ce8be1f1
2020-10-20Merge "Add fuzz target for libsrtp2's fuzzer"Treehugger Robot
2020-10-15Add fuzz target for libsrtp2's fuzzerBranden Archer
Bug: 170243740 Test: Builds and runs Change-Id: I8ec7ebc291cfb43f831c2bd0f5c0699913021c54
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6d7aef8f77 -s ours am: ↵Xin Li
752f0f3790 -s ours am: 66d8b5c0d7 -s ours am skip reason: Change-Id I8b8b7b842e8511bfd35911852849f3ddffaf889c with SHA-1 522a8dc6be is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libsrtp2/+/12797202 Change-Id: Idee78c4fff3e9a720ffe52a1e4e0803732376cda
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6d7aef8f77 -s ours am: ↵Xin Li
752f0f3790 -s ours am skip reason: Change-Id I8b8b7b842e8511bfd35911852849f3ddffaf889c with SHA-1 522a8dc6be is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libsrtp2/+/12797202 Change-Id: Ic54af20e8cede72c70b18fa608a607780eae451d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6d7aef8f77 -s oursXin Li
am skip reason: Change-Id I8b8b7b842e8511bfd35911852849f3ddffaf889c with SHA-1 522a8dc6be is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libsrtp2/+/12797202 Change-Id: I0d626fe3f89d1e5d15f0c5c1f5564ae6383c8f28
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I8b8b7b842e8511bfd35911852849f3ddffaf889c Change-Id: Ic672f373f2d891dc2494566046737888a5bf3982
2020-10-01Mark libsrtp2 as vendor module am: 1915e687eb am: a883cd4301 am: 0eb130624d ↵Harish Mahendrakar
am: 5acbbdd6b1 am: 4b464fd1bf Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/1436631 Change-Id: I0261ca5b5ef9791f00b95aec853d8e23ce6a9109
2020-10-01Mark libsrtp2 as vendor module am: 1915e687eb am: a883cd4301 am: 0eb130624d ↵Harish Mahendrakar
am: 5acbbdd6b1 Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/1436631 Change-Id: I5affa4cfd4d1700d7d520f2bc910a113135cd74a
2020-10-01Mark libsrtp2 as vendor module am: 1915e687eb am: a883cd4301 am: 0eb130624dHarish Mahendrakar
Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/1436631 Change-Id: Icfae801d16ec56b7f13a31c2c0acd3324d4ae1ee
2020-10-01Mark libsrtp2 as vendor module am: 1915e687eb am: a883cd4301Harish Mahendrakar
Original change: https://android-review.googlesource.com/c/platform/external/libsrtp2/+/1436631 Change-Id: I16902a89795b57c72cbc671a64211a88f5644e03