summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r9android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r10android-security-14.0.0_r1android-platform-14.0.0_r1android-platform-13.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-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_r4android-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_r3android-14.0.0_r29android-14.0.0_r28android-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_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-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_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341810000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341812000aml_odp_341717000aml_odp_341610000aml_hef_341811030aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_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_cfg_341510000aml_ase_341810000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341826300aml_ads_341826060aml_ads_341720000aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-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-platform-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_tz5_341510010aml_tz4_332714010aml_rkp_341810000aml_odp_341812000aml_hef_341811030aml_ase_341810000aml_ads_341826300aml_ads_341826060Xin Li
Bug: 189946434 Change-Id: Ife2048bf45ab2d06da9d295da908fc2d8eace381
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6a2f47fb4d -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: 9d7b7ea290 -s ours am: 8865b07dcd -s ours am skip reason: Change-Id Iabd99c8e1402415056eaa16e89966f24798504b8 with SHA-1 b25ef8aabe is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9d656835444b0779738ad19d282673fb6f6345ec
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6a2f47fb4d -s ↵Xin Li
ours am: 9d7b7ea290 -s ours am: 8865b07dcd -s ours am skip reason: Change-Id Iabd99c8e1402415056eaa16e89966f24798504b8 with SHA-1 b25ef8aabe is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I075fa14c9fce5b9541fff62e35df87ec9b94427e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6a2f47fb4d -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: 9d7b7ea290 -s ours am skip reason: Change-Id Iabd99c8e1402415056eaa16e89966f24798504b8 with SHA-1 b25ef8aabe is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5a2fa06e1be0b87991e31495a80fb5c476482494
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6a2f47fb4d -s oursXin Li
am skip reason: Change-Id Iabd99c8e1402415056eaa16e89966f24798504b8 with SHA-1 b25ef8aabe is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4e4d5f0687a5efcb774424741bcbcda2e3ce7533
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Iabd99c8e1402415056eaa16e89966f24798504b8 Change-Id: I95c9b208624c1764528d39975d42f894e32a6400
2020-11-24Mark ab/6881855 as merged am: 4a6c87ef15 am: b25ef8aabeXin Li
Original change: https://googleplex-android-review.googlesource.com/c/toolchain/benchmark/+/13109401 Change-Id: I3ee3cd06cc6f8efee207cf9ead9ffe72f95e2d86
2020-11-24Mark ab/6881855 as merged am: 4a6c87ef15Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/toolchain/benchmark/+/13109401 Change-Id: Iabd99c8e1402415056eaa16e89966f24798504b8
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: Iee1f809cebd602fa209dc0554ffc11aeb5706d34
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 17d0333de1 -s ours am: ↵Xin Li
ba0fb1ca4f -s ours am: 51ac8ba7f1 -s ours am skip reason: Change-Id I4f430ea2043ca44e41f6d32fa72ac44bb35eddc7 with SHA-1 5b978d0009 is in history Original change: https://googleplex-android-review.googlesource.com/c/toolchain/benchmark/+/12796758 Change-Id: Ib5cd18cea2add1f3e4cdd6be91cca1bc065469d5
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 17d0333de1 -s ours am: ↵Xin Li
ba0fb1ca4f -s ours am skip reason: Change-Id I4f430ea2043ca44e41f6d32fa72ac44bb35eddc7 with SHA-1 5b978d0009 is in history Original change: https://googleplex-android-review.googlesource.com/c/toolchain/benchmark/+/12796758 Change-Id: Ief0760df32827435aadb54306ef6cad635dbabf8
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 17d0333de1 -s oursXin Li
am skip reason: Change-Id I4f430ea2043ca44e41f6d32fa72ac44bb35eddc7 with SHA-1 5b978d0009 is in history Original change: https://googleplex-android-review.googlesource.com/c/toolchain/benchmark/+/12796758 Change-Id: I14f3ac5d12df83b35e87d20dad25e175adea6a65
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I4f430ea2043ca44e41f6d32fa72ac44bb35eddc7 Change-Id: Idee9abdbf932d390a1bf5b15ee267abe6606e8c5
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 98e2dff881 -s ours am: 301e2d7f17 -s ours am: fcc79df0be -s ours am: bbb7bc4a9e -s ours am skip reason: Change-Id I05281416de2fe901b50eeb64cb6e8110b2a2bb94 with SHA-1 cb8954a11d is in history Original change: https://googleplex-android-review.googlesource.com/c/toolchain/benchmark/+/12470024 Change-Id: I93cf91ecf3d1f0468ded2eebededbd41bc3c6faf
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 98e2dff881 -s ours am: 301e2d7f17 -s ours am: fcc79df0be -s ours am skip reason: Change-Id I05281416de2fe901b50eeb64cb6e8110b2a2bb94 with SHA-1 cb8954a11d is in history Original change: https://googleplex-android-review.googlesource.com/c/toolchain/benchmark/+/12470024 Change-Id: I5d7f7df3b8ad5d8e5b722575857e3d4463fd170d
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 98e2dff881 -s ours am: 301e2d7f17 -s ours am skip reason: Change-Id I05281416de2fe901b50eeb64cb6e8110b2a2bb94 with SHA-1 cb8954a11d is in history Original change: https://googleplex-android-review.googlesource.com/c/toolchain/benchmark/+/12470024 Change-Id: I7140e26ff1a7f4d9fc142f000105d0879ef0699e
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 98e2dff881 -s ours am skip reason: Change-Id I05281416de2fe901b50eeb64cb6e8110b2a2bb94 with SHA-1 cb8954a11d is in history Original change: https://googleplex-android-review.googlesource.com/c/toolchain/benchmark/+/12470024 Change-Id: Ic36019180640cdbe2a6383dc0a7341cdc6673844
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I05281416de2fe901b50eeb64cb6e8110b2a2bb94 Change-Id: I8d78a21c4121d9925777a8f887ca85c153f1509f
2020-07-28Update language to comply with Android’s inclusive language guidance am: ↵Yi Kong
b8f114fae8 am: 9ab5c830cd am: ff50203953 am: 5b978d0009 am: 75dbcb27e8 Original change: https://android-review.googlesource.com/c/toolchain/benchmark/+/1374316 Change-Id: I0bfd61a2794e355ae293f490482772b984b2d948
2020-07-28Update language to comply with Android’s inclusive language guidance am: ↵Yi Kong
b8f114fae8 am: 9ab5c830cd am: ff50203953 am: 5b978d0009 Original change: https://android-review.googlesource.com/c/toolchain/benchmark/+/1374316 Change-Id: I895f640fce3150ed4d57e55b9402d2a28cdc48cd
2020-07-28Update language to comply with Android’s inclusive language guidance am: ↵Yi Kong
b8f114fae8 am: 9ab5c830cd am: ff50203953 Original change: https://android-review.googlesource.com/c/toolchain/benchmark/+/1374316 Change-Id: I4f430ea2043ca44e41f6d32fa72ac44bb35eddc7
2020-07-28Update language to comply with Android’s inclusive language guidance am: ↵Yi Kong
b8f114fae8 am: 9ab5c830cd Original change: https://android-review.googlesource.com/c/toolchain/benchmark/+/1374316 Change-Id: Ica1063ce8fc08b5c82ce8f90f684728ec6f61175
2020-07-28Update language to comply with Android’s inclusive language guidance am: ↵Yi Kong
b8f114fae8 Original change: https://android-review.googlesource.com/c/toolchain/benchmark/+/1374316 Change-Id: I32a17a2d6288018d949125da00d355fd4cfe76de
2020-07-28Update language to comply with Android’s inclusive language guidanceYi Kong
See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: N/A comment-only Change-Id: I5e76ab37b7937927bc5181e2f42df208c502dbc0
2020-04-30Add METADATA to benchmark: BSD+Apache2=NOTICE am: d80f49c77c am: f0080c2949 ↵Bob Badour
am: cb8954a11d am: 6784b34fd4 am: 9facbb599c Change-Id: Id8efc83596d2e3d43630b129924a7604ac9b1c09
2020-04-30Add METADATA to benchmark: BSD+Apache2=NOTICE am: d80f49c77c am: f0080c2949 ↵Bob Badour
am: cb8954a11d am: 6784b34fd4 Change-Id: If6d70434f02ded5466800369d5aeaf84853df410
2020-04-30Add METADATA to benchmark: BSD+Apache2=NOTICE am: d80f49c77c am: f0080c2949 ↵Bob Badour
am: cb8954a11d Change-Id: I875c149a71b2faa34ae4882043bc61f2bcc82f07
2020-04-30Add METADATA to benchmark: BSD+Apache2=NOTICE am: d80f49c77c am: f0080c2949Bob Badour
Change-Id: I05281416de2fe901b50eeb64cb6e8110b2a2bb94
2020-04-30Add METADATA to benchmark: BSD+Apache2=NOTICE am: d80f49c77candroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: I52382866ed593dd6b9e30b3300a5bdf12993507e
2020-04-29Add METADATA to benchmark: BSD+Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I01825660a596428ba7ca66ea9c0c6139d245efa2
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterr_aml_301500702q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-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_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android-platform-11.0.0_r1android-mainline-12.0.0_r55android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-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_r45android-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-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r6android-11.0.0_r5android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-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_r1android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid11-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-gsiandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: da539cdd8b -s ours am skip reason: subject contains skip directive Change-Id: Iecd23a1e69ab7066bd17671219a7819daecf6e19
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Ic97dba7e758f4ddd525a055890732c600c24325a
2018-12-10[automerger skipped] DO NOT MERGE am: 00d3d7ee38 -s ours am: 526ee8da65 -s ↵Xin Li
ours am: c6be062d8e -s ours Change-Id: I0029f0914c21aae9c39c1fbb09e332b3d77180b1
2018-12-10[automerger skipped] DO NOT MERGE am: 00d3d7ee38 -s oursXin Li
am: 526ee8da65 -s ours Change-Id: Ic54b4dccd5aedc6cf7d56fe9e8c4b64cad0b6908
2018-12-10[automerger skipped] DO NOT MERGEXin Li
am: 00d3d7ee38 -s ours Change-Id: I7dfd2493a9e3efa93c82540438ff955a2771be70
2018-12-07DO NOT MERGEandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Xin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I147c5e239c96cb5bf3302629a6a78806e6a4b957
2018-02-25Snap for 4620899 from ce43588700ff84f20b6bf6a513d8932f693e33dd to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: I3d3e68045925d0e9bb805fc33ef196c9f220929c
2018-02-23Update patch files for bp files of benchmarks am: 2eebfdf9a1 am: 8c624adb4aandroid-wear-8.0.0_r2android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devmaster-cuttlefish-testing-releaseZhizhou Yang
am: 1c0e8bab04 Change-Id: I27a850a001127ea5325d08b1c428ee6074ea85f1
2018-02-23Update patch files for bp files of benchmarks am: 2eebfdf9a1Zhizhou Yang
am: 8c624adb4a Change-Id: I396d2c5b01501e635fa92542297f4b8b084664ed
2018-02-23Update patch files for bp files of benchmarksZhizhou Yang
am: 2eebfdf9a1 Change-Id: I21f7ddb076d2f705f49539284e8937f810e61ca6
2018-02-08Update patch files for bp files of benchmarksandroid-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1Zhizhou Yang
The patches for adding flags to benchmarks were out-of-date and caused patch error while building the benchmarks. For now we still keep these diffs to add flags. Fixed them by renewing the patches for binder, dex2oat, hwui, and skia. Bug: http://b/73090194 Test: Tested and succeeded on all benchmarks. Change-Id: Icd9160dfcb651fa35f9b3dc1c687c246e19891fe
2017-12-14Snap for 4502278 from 0c04a81d4269011242ef9fcf2a7ba5240c943b7d to pi-releaseandroid-build-team Robot
Change-Id: Id2e813af88efc6265c2a16a31df5ece67d283596
2017-12-14Merge "Update diff files which break benchmark suite" am: 8e6687fd5e am: ↵Zhizhou Yang
4d0421beb2 am: 15861f6aa9 Change-Id: Ic0696d6c3db0f65c8df865055d125e20dda45ffd
2017-12-14Merge "Update diff files which break benchmark suite" am: 8e6687fd5eZhizhou Yang
am: 4d0421beb2 Change-Id: If3d23e42a6a055fc99fce3c15df3d9f511ebcc71
2017-12-14Merge "Update diff files which break benchmark suite"Zhizhou Yang
am: 8e6687fd5e Change-Id: I598a6256a480b8c0cb84ddac7452145636cc5f44
2017-12-14Merge "Update diff files which break benchmark suite"android-wear-8.0.0_r1Treehugger Robot
2017-12-14Update diff files which break benchmark suiteZhizhou Yang
Several changes occurred for specific projects since last update, which caused building failure for the benchmark suite. This patch fixes all of them. 1) Panorama project becomes warning-free, so I fixed all the warnings in the patch for panorama benchmark. 2) Skia and dex2oat projects have modifications on certain lines in the bp file, so I updated the patch. 3) Binder no longer needs to include the test directory. 4) Skia becomes static linked to benchmark, so libskia no longer exists. Modified autotest patch so that we do not try to upload libskia.so to device any more. Test: Rebuilt all the benchmarks in the suite and they all work fine now. Change-Id: I9a28bd999e197acae1e8ca434f3db68e1f4dcda9
2017-10-18Snap for 4402171 from 1c4c608ea6fcb31256774954ac6bddfd3232c78d to pi-releaseandroid-build-team Robot
Change-Id: Ib88fcc67c165006ab51c26d1b54311cf5e679b8c
2017-10-18Fix patch for Android.bp in art/compiler am: 5bb7b967fe am: 95500d7427 am: ↵Zhizhou Yang
e3b6739b06 am: f8e70db2d9 Change-Id: Idb6a3aa8eea9edeadaa66a86fbba05e5cecfc766
2017-10-18Fix patch for Android.bp in art/compiler am: 5bb7b967fe am: 95500d7427Zhizhou Yang
am: e3b6739b06 Change-Id: Iae971cd99272e7be30dda3ec44f5e8ba3b136dd4
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 03:27:48 +0000