aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-07-15Snap for 7550844 from 4a02d39b203e353f4b915a08e1d45876f2f38097 to ↵android-mainline-12.0.0_r95android-mainline-12.0.0_r82android-mainline-12.0.0_r66android-mainline-12.0.0_r53android-mainline-12.0.0_r38android-mainline-12.0.0_r18android-mainline-12.0.0_r125android-mainline-12.0.0_r110aml_tet_311811050android12-mainline-tethering-releaseAndroid Build Coastguard Worker
mainline-tethering-release Change-Id: Ie5e509d7b3b7800b9ad72ba99aef0ee1c5067f21
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 ↵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 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
2020-12-15Merge "add crosvm to com.android.virt" am: a9674afaaa am: eaa7f69e1c am: ↵Treehugger Robot
d449d80e36 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1526761 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9946e51be0ecdcb9c66b9459bfbaac6864abbfdc
2020-12-15Merge "add crosvm to com.android.virt" am: a9674afaaa am: eaa7f69e1cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1526761 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I299cdaf6b78f6beece07fcc83b8c7fb57e0f6d0c
2020-12-15Merge "add crosvm to com.android.virt" am: a9674afaaaTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1526761 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I678b225606e788b9043fb8cff04e5667490fa352
2020-12-15Merge "add crosvm to com.android.virt"Treehugger Robot
2020-12-14add crosvm to com.android.virtJiyong Park
To do so, crosvm and its dependencies have the apex_available property set to "//apex_available:platform", "com.android.virt" to explicitly acknowledge the joining. Bug: 174639241 Test: m com.android.virt Change-Id: I2c11f25471e3bbfb9495069db214a4c552799651
2020-11-24Mark ab/6881855 as merged am: 740e5ca5fd am: 960e47c690Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libffi/+/13111709 Change-Id: I626a42d64b0283888995ee43481e743fc49808f5
2020-11-24Mark ab/6881855 as merged am: 740e5ca5fdXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libffi/+/13111709 Change-Id: I3ac8222bca21e36068bed6f49d2c5233a76471d6
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I268fb9455ff4945b771afb9ffd75bee1aac82f30
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: bef7d3e407 -s ours am: ↵Xin Li
e9e38893f2 -s ours am: 3b5804254a -s ours am skip reason: Change-Id If291dbb2725310b336db7de024bd79f1ed5b2563 with SHA-1 ac1fd26616 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libffi/+/12797200 Change-Id: Ida32639a6b7ccad0f5a0963a25ac1e62e4c36ae8
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: bef7d3e407 -s ours am: ↵Xin Li
e9e38893f2 -s ours am skip reason: Change-Id If291dbb2725310b336db7de024bd79f1ed5b2563 with SHA-1 ac1fd26616 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libffi/+/12797200 Change-Id: I1dd3cde700ebbe75edce52bc3f8408a6a233aea3
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: bef7d3e407 -s oursXin Li
am skip reason: Change-Id If291dbb2725310b336db7de024bd79f1ed5b2563 with SHA-1 ac1fd26616 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libffi/+/12797200 Change-Id: Ie0de780cf6b3e1b1dabbab65f1ad862a3b32fe8b
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: If291dbb2725310b336db7de024bd79f1ed5b2563 Change-Id: I4ca18557a03f915ae694b9cfbd9e6a5cde1a0bfb
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 599ec7fb17 -s ours am: cee472a8db -s ours am: 07ca8cca5d -s ours am: 23be52484a -s ours am skip reason: Change-Id I244ca261222f460a0b7b5b0a22200b06609d8aed with SHA-1 5437df8568 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libffi/+/12469776 Change-Id: Icc6b4afe8c735300fd1d8b209643b4625472dc4f
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 599ec7fb17 -s ours am: cee472a8db -s ours am: 07ca8cca5d -s ours am skip reason: Change-Id I244ca261222f460a0b7b5b0a22200b06609d8aed with SHA-1 5437df8568 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libffi/+/12469776 Change-Id: I0feaf7b83213433f0e3e3efd8d02e0912109c29d
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 599ec7fb17 -s ours am: cee472a8db -s ours am skip reason: Change-Id I244ca261222f460a0b7b5b0a22200b06609d8aed with SHA-1 5437df8568 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libffi/+/12469776 Change-Id: Ib2ad34ba950a888fddb1b9815e4f23acc9d95953
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 599ec7fb17 -s ours am skip reason: Change-Id I244ca261222f460a0b7b5b0a22200b06609d8aed with SHA-1 5437df8568 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libffi/+/12469776 Change-Id: Ia479e76dce7e55bc2d28c26e0d2726e039bd7c87
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I244ca261222f460a0b7b5b0a22200b06609d8aed Change-Id: I96ea4c8fe123c9202c95d6405cbb809fcc8df548
2020-08-21Merge "Switch .eh_frame to readonly (from "aw" to "a")." am: 603e044759 am: ↵Treehugger Robot
9fb4309776 am: 5bc3132e15 am: 4d6c5eb976 am: 818496c565 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1406707 Change-Id: I4b9f707dbf876e46b0b14d4e4174947198ee8470
2020-08-21Merge "Switch .eh_frame to readonly (from "aw" to "a")." am: 603e044759 am: ↵Treehugger Robot
9fb4309776 am: 5bc3132e15 am: 4d6c5eb976 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1406707 Change-Id: Iad32627c3432c3f7938214c59858f61faeff6b2f
2020-08-21Merge "Switch .eh_frame to readonly (from "aw" to "a")." am: 603e044759 am: ↵Treehugger Robot
9fb4309776 am: 5bc3132e15 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1406707 Change-Id: I72da244c934020688ee0b80499e82bb2cb6b3426
2020-08-21Merge "Switch .eh_frame to readonly (from "aw" to "a")." am: 603e044759 am: ↵Treehugger Robot
9fb4309776 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1406707 Change-Id: I93ac6de4ec963d6e25df5215daccf188e1833cd3
2020-08-21Merge "Switch .eh_frame to readonly (from "aw" to "a")." am: 603e044759Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1406707 Change-Id: Iaf672736a8eca7d21915e0a5009266274b8acd4f
2020-08-21Merge "Switch .eh_frame to readonly (from "aw" to "a")."Treehugger Robot
2020-08-20Switch .eh_frame to readonly (from "aw" to "a").Stephen Hines
external/libffi/src/x86/sysv.S:832:1: error: changed section flags for .eh_frame, expected: 0x2 .section .eh_frame,"aw",@progbits ^ Bug: http://b/155835175 Test: mma in external/libffi for an x86 target Change-Id: I5cd91db87461fd74aa473e38d1682c190d75bc2b
2020-08-06Merge "Fix libffi issues with dynamic linking (now with mac support)" am: ↵Treehugger Robot
27201c88d0 am: 5ec2ddda05 am: 1c89104396 am: ac1fd26616 am: 629977a111 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1392758 Change-Id: Ifed0c2c0f9b11ebd49a59e55d32c62fabd68f2d8
2020-08-06Merge "Fix libffi issues with dynamic linking (now with mac support)" am: ↵Treehugger Robot
27201c88d0 am: 5ec2ddda05 am: 1c89104396 am: ac1fd26616 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1392758 Change-Id: Ieee1665d02c5b16d341f01ef094fe6b8e824284c
2020-08-06Merge "Fix libffi issues with dynamic linking (now with mac support)" am: ↵Treehugger Robot
27201c88d0 am: 5ec2ddda05 am: 1c89104396 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1392758 Change-Id: If291dbb2725310b336db7de024bd79f1ed5b2563
2020-08-06Merge "Fix libffi issues with dynamic linking (now with mac support)" am: ↵Treehugger Robot
27201c88d0 am: 5ec2ddda05 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1392758 Change-Id: Ifd89659e9fd1a42de583c6f011c3cb2ef092e9f6
2020-08-06Merge "Fix libffi issues with dynamic linking (now with mac support)" am: ↵Treehugger Robot
27201c88d0 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1392758 Change-Id: Iff79715df86251b53de57455125e31198a74ce25
2020-08-06Merge "Fix libffi issues with dynamic linking (now with mac support)"Treehugger Robot
2020-08-06Fix libffi issues with dynamic linking (now with mac support)Stephen Hines
HAVE_HIDDEN_VISIBILITY_ATTRIBUTE was unset, leading to symbols not being properly marked as hidden in assembly. This causes issues for PIC code generation, which is needed when supporting the shared library version of libffi on x86. This patch also fixes some missing support for Mac, since they use `.private_extern` instead of `.hidden` in assembly files. Bug: http://b/162610242 Test: mmma external/libffi Change-Id: I7ee454e29336cfa2ab072a12a4706157fc42ff3c
2020-08-06Merge "Revert "Fix libffi issues with dynamic linking"" am: 411cc2867e am: ↵Insaf Latypov
46a176655a am: 90b5999718 am: 34ebc987d7 am: 4b7de452da Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1393196 Change-Id: I580faf2905ae2f5bc7bd9553c15b3724e7c99ada
2020-08-06Merge "Revert "Fix libffi issues with dynamic linking"" am: 411cc2867e am: ↵Insaf Latypov
46a176655a am: 90b5999718 am: 34ebc987d7 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1393196 Change-Id: I17a4c860a2b77fded1a338366856da0855d80ff7
2020-08-06Merge "Revert "Fix libffi issues with dynamic linking"" am: 411cc2867e am: ↵Insaf Latypov
46a176655a am: 90b5999718 Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1393196 Change-Id: Ie688f59fcb9159f357ded129ad4f95954aa2a349
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 12:39:26 +0000