aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-06-08Merge "Accidental extra token at the end of undef" am: cf1eebfc24 am: ↵HEADandroid-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_r29mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releasePrashanth Swaminathan
479bc8d487 am: 78d9ca4274 am: 434edd40f3 am: d98927ebaf am: 6a7267c4d4 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2619591 Change-Id: If324d334b8020d1630dbb72a4a6a49609569b4ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Merge "Accidental extra token at the end of undef" am: cf1eebfc24 am: ↵Prashanth Swaminathan
479bc8d487 am: 78d9ca4274 am: 434edd40f3 am: d98927ebaf Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2619591 Change-Id: Icbc7de9b1e86016f2a594146046c21f34af5b299 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Merge "Accidental extra token at the end of undef" am: cf1eebfc24 am: ↵Prashanth Swaminathan
479bc8d487 am: 78d9ca4274 am: 434edd40f3 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2619591 Change-Id: I999669f3adacff5cf68a0852f54fca036bddebbe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Merge "Accidental extra token at the end of undef" am: cf1eebfc24 am: ↵Prashanth Swaminathan
479bc8d487 am: 78d9ca4274 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2619591 Change-Id: Id9c3d6fb135d7697ba3d5042f675d92fbb223e92 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Merge "Accidental extra token at the end of undef" am: cf1eebfc24 am: 479bc8d487Prashanth Swaminathan
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2619591 Change-Id: Ia3afcf22b1d20add766e2140946f0b99bb637679 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Merge "Accidental extra token at the end of undef" am: cf1eebfc24Prashanth Swaminathan
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2619591 Change-Id: I872e4829dc94b5d7dbf156b69b5645130df95442 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Merge "Accidental extra token at the end of undef"Prashanth Swaminathan
2023-06-07Accidental extra token at the end of undefPrashanth Swaminathan
Bug: 282104321 Test: Verified ltp build. Change-Id: Ib356f2d493c038d63d2f42eee4bd66f1ae6f0878
2023-06-07Merge "Add riscv64 target to libffi" am: 8d07cb2e87 am: 449d0f2683 am: ↵Treehugger Robot
927d45b995 am: fc00dd70f1 am: 0972671add am: 97d61cb3d0 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2617596 Change-Id: Iec842f0c00d525c96eaac56def82c1b970877a97 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07Merge "Add riscv64 target to libffi" am: 8d07cb2e87 am: 449d0f2683 am: ↵Treehugger Robot
927d45b995 am: fc00dd70f1 am: 0972671add Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2617596 Change-Id: I32ba49425e356f2d8d3157a9be42029c67746175 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07Merge "Add riscv64 target to libffi" am: 8d07cb2e87 am: 449d0f2683 am: ↵Treehugger Robot
927d45b995 am: fc00dd70f1 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2617596 Change-Id: Iaa8be178eb831e1ad43fb1c03946a3cb0196175b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07Merge "Add riscv64 target to libffi" am: 8d07cb2e87 am: 449d0f2683 am: ↵Treehugger Robot
927d45b995 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2617596 Change-Id: I8b08ec2d5ee8700fc9616ba3a5bd00e4f4331dd3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07Merge "Add riscv64 target to libffi" am: 8d07cb2e87 am: 449d0f2683Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2617596 Change-Id: I398e03e3b22c25a6b81031bd5a9159a713979d16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07Merge "Add riscv64 target to libffi" am: 8d07cb2e87Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2617596 Change-Id: Ia174a21b3eaa17c02b09b212fd0cf4cac4c69e0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07Merge "Add riscv64 target to libffi"Treehugger Robot
2023-06-06Add riscv64 target to libffiPrashanth Swaminathan
In order to build VTS tests, libffi is a requirement. Add the configuration to build libffi for 'riscv64'. Bug: 282104321 Test: Verified vts build no longer fails on 'libffi'. Change-Id: I4cf5fe4c91a1eeead065756aa691e456577e91ae
2022-03-04Merge "Move comment to license_note" am: 23c2afcec8 am: 164ef33602 am: ↵android-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_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_341510000android14-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-releaseBob Badour
5ec257d943 am: a8011b453b am: 47314d07bf Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2007803 Change-Id: Icace97c3d6cc882f02f0734e530fc81d1f4ec795
2022-03-04Merge "Move comment to license_note" am: 23c2afcec8 am: 164ef33602 am: ↵Bob Badour
5ec257d943 am: a8011b453b Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2007803 Change-Id: I50fa7ef51268ce9bc20beb1579862c9a435796c1
2022-03-04Merge "Move comment to license_note" am: 23c2afcec8 am: 164ef33602 am: ↵aml_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_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010Bob Badour
5ec257d943 am: a8011b453b Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2007803 Change-Id: I868326944acfde669abfc3291e7b91729d7125fc
2022-03-04Merge "Move comment to license_note" am: 23c2afcec8 am: 164ef33602 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-u-beta-1-gplandroid-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_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000main-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-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseBob Badour
5ec257d943 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2007803 Change-Id: I06dc4df4131c19cdde37b75b22d61e31d93c5096
2022-03-04Merge "Move comment to license_note" am: 23c2afcec8 am: 164ef33602Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2007803 Change-Id: Ib15d5fceb4135c85839022a120b325e62e2f7aaa
2022-03-04Merge "Move comment to license_note" am: 23c2afcec8Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/2007803 Change-Id: Ic35440c7c070dd8c9b8cffea9379061c59212145
2022-03-04Merge "Move comment to license_note"Bob Badour
2022-03-03Move comment to license_noteBob Badour
Comments not preserved during refresh. Test: m nothing Change-Id: I6d0a949dda0850d3e656486ff1bee505141e6d84
2021-10-19Merge "Add CMakeLists.txt file for Windows x86_64 MSVC build" am: 9fcf766553 ↵Ryan Prichard
am: cb4e611731 am: 9487404fae am: ba809adf4f am: ebeef145c8 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1845814 Change-Id: I40f64fcf257605514c0950f96c3d3986bef7ce74
2021-10-19Merge "Add CMakeLists.txt file for Windows x86_64 MSVC build" am: 9fcf766553 ↵Ryan Prichard
am: cb4e611731 am: 9487404fae am: ba809adf4f Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1845814 Change-Id: I75e63d83f76d771fff7d2543316c774d5eb9540c
2021-10-19Merge "Add CMakeLists.txt file for Windows x86_64 MSVC build" am: 9fcf766553 ↵Ryan Prichard
am: cb4e611731 am: 9487404fae Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1845814 Change-Id: I48e155efbfa31113b70ae85f26ad2778c497c162
2021-10-19Merge "Add CMakeLists.txt file for Windows x86_64 MSVC build" am: 9fcf766553 ↵Ryan Prichard
am: cb4e611731 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1845814 Change-Id: I9e64fa694b49520ae056d6d4cadcb8f9695388f3
2021-10-19Merge "Add CMakeLists.txt file for Windows x86_64 MSVC build" am: 9fcf766553android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Ryan Prichard
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1845814 Change-Id: I502b7c0102afb653782867cccf41456dd028bb3d
2021-10-18Merge "Add CMakeLists.txt file for Windows x86_64 MSVC build"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Ryan Prichard
2021-10-14Add CMakeLists.txt file for Windows x86_64 MSVC buildRyan Prichard
Bug: none Test: external\python\cpython3\kokoro\kokoro_build.cmd Test: py -3 external\python\cpython3\kokoro\prepare_windows_externals.py Test: kokoro presubmit for ndk/python3/windows_presubmit job Change-Id: I67232294c118ef0b676831de8d9c7f7ec9e40e86
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I1c8a7a6098fe925b9949f7a4b0373b194e8e96cc
2021-05-29Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libffi" am: 1fdf4e9fa0 am: ↵Bob Badour
0c0678c4fc am: b3341cad5f am: 1b5d96913e am: 8979a98e7b Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1588620 Change-Id: I85b027b50a74f75f58a4143732c114e5e78c9e13
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f3dd102521 -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: 911a68cbca -s ours am: 17fb9a0c08 -s ours am skip reason: Change-Id I299cdaf6b78f6beece07fcc83b8c7fb57e0f6d0c with SHA-1 d449d80e36 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0a6e7dec8718a444c81e7310324a48dfa5523c52
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f3dd102521 -s ↵Xin Li
ours am: 911a68cbca -s ours am: 17fb9a0c08 -s ours am skip reason: Change-Id I299cdaf6b78f6beece07fcc83b8c7fb57e0f6d0c with SHA-1 d449d80e36 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0c8c15e3a09be62d338284bb9b8998472bda1132
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f3dd102521 -s ↵android-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-releaseXin Li
ours am: 911a68cbca -s ours am skip reason: Change-Id I299cdaf6b78f6beece07fcc83b8c7fb57e0f6d0c with SHA-1 d449d80e36 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iffa1ecc9c4ecd0cfe6e1a20b65cac7447c13ce5f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f3dd102521 -s oursXin Li
am skip reason: Change-Id I299cdaf6b78f6beece07fcc83b8c7fb57e0f6d0c with SHA-1 d449d80e36 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I848c80346d06bb60a37f3dbfec13097be5ea35c2
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: I299cdaf6b78f6beece07fcc83b8c7fb57e0f6d0c Change-Id: I0b52fec8932f33b928c7d23aa077f60f8d6721b4
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libffi" am: 1fdf4e9fa0 am: ↵Bob Badour
0c0678c4fc am: b3341cad5f am: 1b5d96913e Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1588620 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I810c1369aede894d07b5955e4477cdbac2d11255
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libffi" am: 1fdf4e9fa0 am: ↵Bob Badour
0c0678c4fc am: b3341cad5f am: 1b5d96913e Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1588620 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iafaa4c726afd15f001b69ee5eab2758e300abc52
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libffi" am: 1fdf4e9fa0 am: ↵Bob Badour
0c0678c4fc am: b3341cad5f Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1588620 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2e0daa7dd70b621fb386fd4f40dfb75c2f61b3b3
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libffi" am: 1fdf4e9fa0 am: ↵Bob Badour
0c0678c4fc Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1588620 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idfe760d111636405c83ae1f264c2073afd8b2bd8
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libffi" am: 1fdf4e9fa0Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1588620 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ica176be22ba5fd60e524781e4db9e8bec5887024
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libffi"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libffiBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-GPL-3.0 SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-MIT SPDX-license-identifier-MPL legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ifed53ba1d17d76a1a1b6d6c75444c0999b4b4290
2021-01-26Merge "Fix license_type. Contains GPL" am: 638d64157e am: a12d53a133 am: ↵Bob Badour
dd4c81fbad Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1556999 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iada853dd222d1c6316c174d942f579f93e8b94d7
2021-01-26Merge "Fix license_type. Contains GPL" am: 638d64157e am: a12d53a133Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1556999 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6fcb0fb508190faf0948828359ac698aa44f09cc
2021-01-26Merge "Fix license_type. Contains GPL" am: 638d64157eBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1556999 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I68cd0a9bd30fdca93238a66ebaa8984892a39e1a
2021-01-26Merge "Fix license_type. Contains GPL"Bob Badour
2021-01-24Fix license_type. Contains GPLBob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: I9050ff4b58d6beb862cfae20d00aade015566e02