aboutsummaryrefslogtreecommitdiff
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_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_331131000main-16k-with-phonesmain-16kandroid13-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: I7e6f78ccc7395c4e54aca9c8bd6da9c720c1af1b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4638045b18 -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: 17a3f98ae9 -s ours am: c4b55a3176 -s ours am skip reason: Change-Id I8504165b13a3532e19d4f966ce992d3c7feaa4ee with SHA-1 d059c674d5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic4548c8e8c6f938828297fc13e9f07cf59170faf
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4638045b18 -s ↵Xin Li
ours am: 17a3f98ae9 -s ours am: c4b55a3176 -s ours am skip reason: Change-Id I8504165b13a3532e19d4f966ce992d3c7feaa4ee with SHA-1 d059c674d5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I139b1546aa987bc02084abb4b8f099d699cfb594
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4638045b18 -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: 17a3f98ae9 -s ours am skip reason: Change-Id I8504165b13a3532e19d4f966ce992d3c7feaa4ee with SHA-1 d059c674d5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If5f67d156156a3a4e91c5be1a15f5da8bd6cfb88
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4638045b18 -s oursXin Li
am skip reason: Change-Id I8504165b13a3532e19d4f966ce992d3c7feaa4ee with SHA-1 d059c674d5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5d4d54c36215c8faf18de4cd6c5b430a72eedffc
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: I8504165b13a3532e19d4f966ce992d3c7feaa4ee Change-Id: Iac84500b447f5ce38328f8fb8dcd7458853d114f
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/compiler-rt" am: 39d8135926 ↵Bob Badour
am: 8a507da230 am: 8984d72541 am: 744682b020 Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1588163 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6467040720c75f25ab716351111b9d2f42ff2b91
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/compiler-rt" am: 39d8135926 ↵Bob Badour
am: 8a507da230 am: 8984d72541 am: 744682b020 Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1588163 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3c786aa2d377d854ecd2bea08284c672a34eb85d
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/compiler-rt" am: 39d8135926 ↵Bob Badour
am: 8a507da230 am: 8984d72541 Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1588163 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9245a91c300695fc372e6ba5f3806b0b4ebc8b7c
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/compiler-rt" am: 39d8135926 ↵Bob Badour
am: 8a507da230 Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1588163 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I22e9eeedd5399defe0ee80b47a3f611334acadea
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/compiler-rt" am: 39d8135926Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1588163 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6bdef3dc63117e0e5d1df31d4e8714155f06d24b
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/compiler-rt"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/compiler-rtBob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-NCSA legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I615a34fef7b0282577c8a5bf2fbf7c205d1bd3a6
2021-01-21Merge "Switch libcompiler_rt to the LLVM prebuilt libunwind" am: 1eda370e3c ↵Ryan Prichard
am: ec51602b49 am: e6a52b1fb0 Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1554717 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id2196a502ff6eefb014fc9b64e2b07fcefe22d5e
2021-01-21Merge "Switch libcompiler_rt to the LLVM prebuilt libunwind" am: 1eda370e3c ↵Ryan Prichard
am: ec51602b49 Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1554717 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3b7dde8734085f4d87c293b45f00671565e67c7b
2021-01-21Merge "Switch libcompiler_rt to the LLVM prebuilt libunwind" am: 1eda370e3cRyan Prichard
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1554717 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7f70a5460b2f764b6a44bafb539cfb3bc4c4d880
2021-01-20Merge "Switch libcompiler_rt to the LLVM prebuilt libunwind"Ryan Prichard
2021-01-19Switch libcompiler_rt to the LLVM prebuilt libunwindRyan Prichard
Bug: http://b/153025717 Test: atest CtsRenderscriptTestCases Change-Id: Iae35fc183b172a395a25450b74b754e02f996c86
2021-01-15Merge "Switch RenderScript's compiler-rt to existing unwinders." am: ↵Treehugger Robot
14e0b71fff am: fee4ccc59a am: 406fc1eaee Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1551194 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I693a70d0fc657406687c997fdb61a301916e5e9b
2021-01-15Merge "Switch RenderScript's compiler-rt to existing unwinders." am: ↵Treehugger Robot
14e0b71fff am: fee4ccc59a Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1551194 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib25b6b9e40985dac9a58e835adfb4f4f16e881ed
2021-01-15Merge "Switch RenderScript's compiler-rt to existing unwinders." am: 14e0b71fffTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1551194 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I58b46739107b190ee668587f492be37b52aa7f05
2021-01-15Merge "Switch RenderScript's compiler-rt to existing unwinders."Treehugger Robot
2021-01-15Switch RenderScript's compiler-rt to existing unwinders.Stephen Hines
Test: atest CtsRenderscriptTestCases Change-Id: Ib973bbd8c4e406bc76cd2cb7d78aba696b156f02
2021-01-06Merge "Use vndk.private: true for VNDK-private libs" am: 65c164706b am: ↵Treehugger Robot
4f2d104450 am: b6f970d822 Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1538767 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I27e4e2ca3fba5dfada9bfd33d5b34c5d0175d60f
2021-01-06Merge "Use vndk.private: true for VNDK-private libs" am: 65c164706b am: ↵Treehugger Robot
4f2d104450 Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1538767 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9d768d54f99fd48e1bf44a233f32de0244457fb5
2021-01-06Merge "Use vndk.private: true for VNDK-private libs" am: 65c164706bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1538767 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I76f757156eef73a8caddab7ad3442bcb33001abe
2021-01-06Merge "Use vndk.private: true for VNDK-private libs"Treehugger Robot
2021-01-05Use vndk.private: true for VNDK-private libsJustin Yun
Instead of using `vendor_available: false`, use `vndk.private: true` for VNDK-private libraries. Bug: 175768895 Test: build Change-Id: Ib952b912d36ad694142e1bcbeb2f98a27039ebc4
2020-11-30Merge "Add "product_available" to product available modules" am: cdc4dc22b7 ↵Treehugger Robot
am: c717e77746 am: d059c674d5 Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1495757 Change-Id: Ibeb955606d2c115a18c45f85ce66c10a8098fa17
2020-11-30Merge "Add "product_available" to product available modules" am: cdc4dc22b7 ↵Treehugger Robot
am: c717e77746 Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1495757 Change-Id: I8504165b13a3532e19d4f966ce992d3c7feaa4ee
2020-11-30Merge "Add "product_available" to product available modules" am: cdc4dc22b7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1495757 Change-Id: I5c8bf3a1cfd1a053eff7bb4ea8030a257875f49b
2020-11-30Merge "Add "product_available" to product available modules"Treehugger Robot
2020-11-24Mark ab/6881855 as merged am: cf58e0bb7c am: 704758a832Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/13112550 Change-Id: Ia99e248457ce4bdc3ed1234eda59d4d37426b0ac
2020-11-24Mark ab/6881855 as merged am: cf58e0bb7cXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/13112550 Change-Id: Ib2a17893bb358bfce818f90632cf8e7e7e558f37
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Iabd4ec5347b8bad4f38c9ccd40997e1009e455f5
2020-11-11Add "product_available" to product available modulesJustin Yun
"vendor_available" modules were available to product modules. However, not all "vendor_available" modules are required to be available to product modules. Some modules want to be available only to product modules but not vendor modules. To cover the requirement, we separate "product_available" from "vendor_available". "vendor_available" will not provide product available module. Bug: 150902910 Test: build Change-Id: I9f86b46416fffefa2749648c136bfc05b3488920
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 8d1a045313 -s ours am: ↵Xin Li
b709b831eb -s ours am: c554872be5 -s ours am skip reason: Change-Id I93747e6a05c361bb62a07229a5328a33b1be8114 with SHA-1 3e0481a510 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12796229 Change-Id: I5bf57a81b4191d66567e1667318d2002b4f707d7
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 8d1a045313 -s ours am: ↵Xin Li
b709b831eb -s ours am skip reason: Change-Id I93747e6a05c361bb62a07229a5328a33b1be8114 with SHA-1 3e0481a510 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12796229 Change-Id: I53a5c7964cad950fc08bf12ef8f091e33f012134
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 8d1a045313 -s oursXin Li
am skip reason: Change-Id I93747e6a05c361bb62a07229a5328a33b1be8114 with SHA-1 3e0481a510 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12796229 Change-Id: Iab84779f649aff7c3d40b4c2c552c4ab6737d24f
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I93747e6a05c361bb62a07229a5328a33b1be8114 Change-Id: I05dc93b185a578448ed567e1f465b2589ffed4f8
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: e1df04d400 -s ours am: b87faa2e64 -s ours am: 957d50d329 -s ours am: 48963c4cf3 -s ours am skip reason: Change-Id I7a1807955dcffb30deedcd3c864351aafdd74468 with SHA-1 d74e89f967 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12469773 Change-Id: Iad8d68fe8cab8940360609efc270336564b4afae
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: e1df04d400 -s ours am: b87faa2e64 -s ours am: 957d50d329 -s ours am skip reason: Change-Id I7a1807955dcffb30deedcd3c864351aafdd74468 with SHA-1 d74e89f967 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12469773 Change-Id: I2bf3e7c90f6cc92eb000ada6136dd9a4810b86bc
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: e1df04d400 -s ours am: b87faa2e64 -s ours am skip reason: Change-Id I7a1807955dcffb30deedcd3c864351aafdd74468 with SHA-1 d74e89f967 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12469773 Change-Id: Ib142a3b68747830e295719c4c307e3eb2a0faf0f
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: e1df04d400 -s ours am skip reason: Change-Id I7a1807955dcffb30deedcd3c864351aafdd74468 with SHA-1 d74e89f967 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12469773 Change-Id: I386380fc285d2bc00a052c2230e79156b9db7c15
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I7a1807955dcffb30deedcd3c864351aafdd74468 Change-Id: I0471736546250156829a0e4b38d36cc3803d362c
2020-07-28Merge "Rename CFI blocklist file." am: e6b2b9154e am: b42924c359 am: ↵Treehugger Robot
151f40c86e am: 3e0481a510 am: 4c9058b8cc Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1373396 Change-Id: Ie39adad5fa184e92817f930c263fde631841bf3d
2020-07-28Merge "Rename CFI blocklist file." am: e6b2b9154e am: b42924c359 am: ↵Treehugger Robot
151f40c86e am: 3e0481a510 Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1373396 Change-Id: Ib7acd72ddb459253883805fd40bcc956dd436fc4
2020-07-28Merge "Rename CFI blocklist file." am: e6b2b9154e am: b42924c359 am: 151f40c86eTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1373396 Change-Id: I93747e6a05c361bb62a07229a5328a33b1be8114
2020-07-28Merge "Rename CFI blocklist file." am: e6b2b9154e am: b42924c359Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1373396 Change-Id: Ic482adf7a2e96a311cdc28a3bb920b9e3ff41ec6
2020-07-28Merge "Rename CFI blocklist file." am: e6b2b9154eTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1373396 Change-Id: I9f1369c55b89117adacc70947e0530cfc54848d4
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 11:26:30 +0000