summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-11Merge "Teach mclinker that SHT_RELR sections are just relocations." am: ↵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-releaseElliott Hughes
ee8091affa am: cf06b4a943 am: d8f7e0ee32 am: 3f42d04145 Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1702185 Change-Id: I08dbb643c8e6edb51ba907cd27137759b2edb14e
2021-05-11Merge "Teach mclinker that SHT_RELR sections are just relocations." am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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-devandroid12-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-devElliott Hughes
ee8091affa am: cf06b4a943 am: d8f7e0ee32 Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1702185 Change-Id: Ie5d9698f9f7fc907b2125c2d1aec0fd20293c534
2021-05-11Merge "Teach mclinker that SHT_RELR sections are just relocations." am: ↵Elliott Hughes
ee8091affa am: cf06b4a943 Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1702185 Change-Id: Ifea75fbde99d0ab42f192b36eb15a6a058d00cec
2021-05-11Merge "Teach mclinker that SHT_RELR sections are just relocations." am: ↵android-s-beta-4android-s-beta-3android-s-beta-4Elliott Hughes
ee8091affa Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1702185 Change-Id: I7a3989728eca1ff317afc4b6441d4bd561d0dc3b
2021-05-11Merge "Teach mclinker that SHT_RELR sections are just relocations."android-s-beta-2android-s-beta-1Elliott Hughes
2021-05-10Teach mclinker that SHT_RELR sections are just relocations.Elliott Hughes
Nothing to see here, mclinker... We can't use the named constant because the version of LLVM used by mclinker is too old to have it, so mclinker gets a hard-coded 19. Bug: http://b/147452927 Test: atest CtsRsCppTestCases:android.cts.rscpp.RSYuvTest#test_YV12 -- --abi x86_64 Change-Id: I71e84b4f030396c2515feedb8248a06e1603a176
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 00e2459843 -s ↵Xin Li
ours am: 6997a6a437 -s ours am: 949980c8fb -s ours am skip reason: Change-Id I5af0de1160c938451e87c94a53621e885af58eab with SHA-1 4d0284fc5a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0b889e0ef2bff89d468d64c3b34ddde700c24ac7
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 00e2459843 -s ↵Xin Li
ours am: 6997a6a437 -s ours am skip reason: Change-Id I5af0de1160c938451e87c94a53621e885af58eab with SHA-1 4d0284fc5a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I274d2e23a12191b3086d27f1d28dbf0b8c3f275c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 00e2459843 -s oursXin Li
am skip reason: Change-Id I5af0de1160c938451e87c94a53621e885af58eab with SHA-1 4d0284fc5a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibe8bc5d0d30a850c714c90b8747b7ded9cf1e9aa
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I5af0de1160c938451e87c94a53621e885af58eab Change-Id: I1c534ae0738cbbf7bab85bc4ce69b1a672ed45e8
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/compile/mclinker" am: ↵Treehugger Robot
b031e3247e am: 3ffe70ba7f am: 3264f09741 am: 0a830f4920 Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1588965 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2abf34998e93ce3910e7fd829adc0e41f7d6f76e
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/compile/mclinker" am: ↵Treehugger Robot
b031e3247e am: 3ffe70ba7f am: 3264f09741 Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1588965 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie79edafecba20a2669ec78d284c30f1bad2480ec
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/compile/mclinker" am: ↵Treehugger Robot
b031e3247e am: 3ffe70ba7f Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1588965 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib44166c7d96614d58936ea623212eb0132f3e344
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/compile/mclinker" am: ↵Treehugger Robot
b031e3247e Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1588965 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I73b09d6d175c29182e7d4aa43ed426abfb1405ef
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/compile/mclinker"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to frameworks/compile/mclinkerBob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-NCSA to: Android.bp Added SPDX-license-identifier-NCSA to: lib/ADT/Android.bp lib/Android.bp lib/Core/Android.bp lib/Fragment/Android.bp lib/LD/Android.bp lib/MC/Android.bp lib/Object/Android.bp lib/Script/Android.bp lib/Support/Android.bp lib/Target/AArch64/Android.bp lib/Target/AArch64/TargetInfo/Android.bp lib/Target/ARM/Android.bp lib/Target/ARM/TargetInfo/Android.bp lib/Target/Android.bp lib/Target/Mips/Android.bp lib/Target/Mips/TargetInfo/Android.bp lib/Target/X86/Android.bp lib/Target/X86/TargetInfo/Android.bp tools/mcld/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I61793a4a7ca858b4b6e9eab8d732784f12a1d52c
2021-02-10Merge "Remove unused test input file." am: a73f2e6458 am: 1c09552493 am: ↵Stephen Hines
c35d944ab5 am: b72330f84b Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1580867 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I00a485682b7d42ca1e85579e7eb6e157d9bd3f46
2021-02-09Merge "Remove unused test input file." am: a73f2e6458 am: 1c09552493 am: ↵Stephen Hines
c35d944ab5 Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1580867 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7d16c4a6a503dc662708bc13b8fb98ed6a8dbefe
2021-02-09Merge "Remove unused test input file." am: a73f2e6458 am: 1c09552493Stephen Hines
Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1580867 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1a458934cbedf7567f7a23d5b9b507f089a0cd7c
2021-02-09Merge "Remove unused test input file." am: a73f2e6458Stephen Hines
Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1580867 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8364a1b0f928c7e705876996aeb8d6e8d6a3b1ad
2021-02-09Merge "Remove unused test input file."Stephen Hines
2021-02-08Remove unused test input file.Stephen Hines
We don't run these unit tests, so the extra source inputs are unnecessary. Test: N/A Change-Id: I1d72b0d1e8ba76ac7485be75befedcd30df2006c
2020-11-25Mark ab/6881855 as merged am: 58f66cc6e5 am: 4d0284fc5aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/13112977 Change-Id: I627df434867cf61902b1dbb9d85c2823ce0f4b56
2020-11-25Mark ab/6881855 as merged am: 58f66cc6e5Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/13112977 Change-Id: I5af0de1160c938451e87c94a53621e885af58eab
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I7e79c9e2d919345303486797b79018c3b5355e8d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7709ce7275 -s ours am: ↵Xin Li
3bc267c99a -s ours am: c69814ea3c -s ours am skip reason: Change-Id I8e9155d24a9c78a50579256ba689f97f04712510 with SHA-1 4b1a1d398b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/12796466 Change-Id: I7e5775551642a241efa22c0a5da83dad291b0a7b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7709ce7275 -s ours am: ↵Xin Li
3bc267c99a -s ours am skip reason: Change-Id I8e9155d24a9c78a50579256ba689f97f04712510 with SHA-1 4b1a1d398b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/12796466 Change-Id: I1fae5e6af3b9bdebd0d6df2ecbd739cdedfdca2c
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7709ce7275 -s oursXin Li
am skip reason: Change-Id I8e9155d24a9c78a50579256ba689f97f04712510 with SHA-1 4b1a1d398b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/12796466 Change-Id: I0eeda5d4212be353046c679ec90c29ef19ab69c9
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I8e9155d24a9c78a50579256ba689f97f04712510 Change-Id: If8907631a0d4226a0dd687c8e16dc933fe9a2c91
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 532fc0aa91 -s ours am: 512bd84502 -s ours am: 9387497485 -s ours am: 2d8eba5cae -s ours am skip reason: Change-Id I003e63fe3721717c38f99551c443e5c1f4dcb3e4 with SHA-1 4565797579 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/12469920 Change-Id: I1ce3351aba22b2776be9408f107f14d4d054bfb3
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 532fc0aa91 -s ours am: 512bd84502 -s ours am: 9387497485 -s ours am skip reason: Change-Id I003e63fe3721717c38f99551c443e5c1f4dcb3e4 with SHA-1 4565797579 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/12469920 Change-Id: Ib5273b1ea14d7c204f367e984542dbd4b80bbaa0
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 532fc0aa91 -s ours am: 512bd84502 -s ours am skip reason: Change-Id I003e63fe3721717c38f99551c443e5c1f4dcb3e4 with SHA-1 4565797579 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/12469920 Change-Id: I24f3f258f066579b4d56202d022a94ab20f34549
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 532fc0aa91 -s ours am skip reason: Change-Id I003e63fe3721717c38f99551c443e5c1f4dcb3e4 with SHA-1 4565797579 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/12469920 Change-Id: I686b127a8002c00218ee6d249651892baa12ec0e
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I003e63fe3721717c38f99551c443e5c1f4dcb3e4 Change-Id: Ic4ca268e05ad56db413ca079fc958ad9ca6a2598
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot
am: a4d0f51e53 am: abbecb888a am: c9328b7e6e am: 4b1a1d398b am: d3ceaa5146 Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1373943 Change-Id: I1a56fc863279abc52bea150bd7f4b245436b9529
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot
am: a4d0f51e53 am: abbecb888a am: c9328b7e6e am: 4b1a1d398b Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1373943 Change-Id: I8918162198cc4cb1c2bb1dca60fc11092f5180b9
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot
am: a4d0f51e53 am: abbecb888a am: c9328b7e6e Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1373943 Change-Id: I8e9155d24a9c78a50579256ba689f97f04712510
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot
am: a4d0f51e53 am: abbecb888a Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1373943 Change-Id: I97a9c50f6ad6080dc0ee55c7dba4f8928c0e4e20
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot
am: a4d0f51e53 Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1373943 Change-Id: I54dbaeb6dd3467ab109030016f0f7bbc2532051b
2020-07-28Merge "Update language to comply with Android's inclusive language guidance"Treehugger Robot
2020-07-27Update language to comply with Android's inclusive language guidanceStephen Hines
See https://source.android.com/setup/contribute/respectful-code for reference BUG=161896447 Test: N/A (comments only) Change-Id: I5475ddd14ca54ab4ed474fdc6643cbabe15676e2
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: da5dd7a6e1 -s ours am: 4565797579 am: 421a708b57 am: ac8104b446 -s ours am skip reason: subject contains skip directive Change-Id: I221862923f513a5512d4bb4fd284328587c2fa6d
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: da5dd7a6e1 -s ours am: 4565797579 am: 421a708b57 Change-Id: Icfc9edba541927ec757f0587910864dcf1ec61f6
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: da5dd7a6e1 -s ours am: 4565797579 Change-Id: I78a05c91f7c036ad026db1167fc3df88b813c144
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: da5dd7a6e1 -s ours am skip reason: subject contains skip directive Change-Id: I003e63fe3721717c38f99551c443e5c1f4dcb3e4
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li
Bug: 151763422 Change-Id: If8930edf8f49151c7a1a1ecaea9852b41cfe21bf
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: f8c1e67cfc -s ours am: 560c6afd6c am: 1905d6b1e8 am: 6fb5264802 -s ours am skip reason: subject contains skip directive Change-Id: I069c4ccce85780d12783ee5ea88bcbebd600ea58
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: f8c1e67cfc -s ours am: 560c6afd6c am: 1905d6b1e8 Change-Id: Ic0eb8ddf4876b81d976d2c0ba3d920ae998a3125
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: f8c1e67cfc -s ours am: 560c6afd6c Change-Id: I02f1e5d4a32b39d82e346ce013ac9751c787e5ab
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: f8c1e67cfc Change-Id: I8fafee34d0f23fe1a4ce9866da0e3d57bad89a0f
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 14:25:57 +0000