summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-09Move Conscrypt host and test exports to live next to the SDK in am: ↵android-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_r56android-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_r32android13-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-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseMartin Stjernholm
1c14d5fdcb am: d32fd22e9b Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/runtime/+/18188751 Change-Id: I92867ed11f01475a4c2853c3458fec2eed125903 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09Move Conscrypt host and test exports to live next to the SDK in am: 1c14d5fdcbMartin Stjernholm
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/runtime/+/18188751 Change-Id: I2828de901c2990a90a57f4f2d06d0f941cf3f677 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06Move Conscrypt host and test exports to live next to the SDK inandroid13-devMartin Stjernholm
prebuilts/module_sdk/conscrypt/current. Test: m nothing Test: banchan com.android.conscrypt && m nothing Bug: 194489982 Change-Id: Ief12aa6480b35c1c4368d0b819951b6399bef6f6
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: a8c0fdde97 -s ours am: d9a0c050c3 -s ours am: 2300fc0413 -s ours am: 0aa11ab44e -s ours am skip reason: Merged-In Ice807c09147f3b87ff7cd00036e8962a67e7c2b2 with SHA-1 81adb762a9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/runtime/+/17805477 Change-Id: I0fb8fd06089a56f99369c5b57e5fb16d64593c6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: a8c0fdde97 -s ours am: d9a0c050c3 -s ours am: 2300fc0413 -s ours am skip reason: Merged-In Ice807c09147f3b87ff7cd00036e8962a67e7c2b2 with SHA-1 81adb762a9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/runtime/+/17805477 Change-Id: Ifd79f02dc0a1d5897fa7074d134bbb63fcbafd64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: a8c0fdde97 -s ours am: d9a0c050c3 -s ours am skip reason: Merged-In Ice807c09147f3b87ff7cd00036e8962a67e7c2b2 with SHA-1 81adb762a9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/runtime/+/17805477 Change-Id: I5279ce1f00e7dd90205e107d296cbeb371b58f63 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: a8c0fdde97 -s ours am skip reason: Merged-In Ice807c09147f3b87ff7cd00036e8962a67e7c2b2 with SHA-1 81adb762a9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/runtime/+/17805477 Change-Id: I4c166d1463c8bde9c204805c020c9c58756e1dde Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047Xin Li
Bug: 226662282 Merged-In: Ice807c09147f3b87ff7cd00036e8962a67e7c2b2 Change-Id: I332bc33d0698407b4d8653e7e1c3bab789a0ec67
2022-04-13Merge changes I4f04b058,Ia2d97568 am: ab8690cfd7 am: 3e85b9ede2 am: ↵Martin Stjernholm
b564b1c5c6 am: b99c42f41c am: 8e4d4deaaf Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2060064 Change-Id: I26afbff2b417d56933cf131b896e05b4bbd27d11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge changes I4f04b058,Ia2d97568 am: ab8690cfd7 am: 3e85b9ede2 am: ↵Martin Stjernholm
b564b1c5c6 am: b99c42f41c Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2060064 Change-Id: I7cc041aa80ef484f13b357f55e73623b8ac3bc6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge changes I4f04b058,Ia2d97568 am: ab8690cfd7 am: 3e85b9ede2 am: b564b1c5c6Martin Stjernholm
Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2060064 Change-Id: Ib352cf73ee3706bd9be9ea0fcafb6ab03479410f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge changes I4f04b058,Ia2d97568 am: ab8690cfd7 am: 3e85b9ede2Martin Stjernholm
Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2060064 Change-Id: Idef7e47cda8f9233040ea613deb511e5e8532d0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge changes I4f04b058,Ia2d97568 am: ab8690cfd7Martin Stjernholm
Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2060064 Change-Id: I01cbc62b1613b3019a8d748a640c514e12673ecc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge changes I4f04b058,Ia2d97568Martin Stjernholm
* changes: Update mainline prebuilts to build 8376291. Enable Bionic host-exports together with the SDK.
2022-04-12Update mainline prebuilts to build 8376291.Martin Stjernholm
Taken from branch aosp-master. CL prepared by prebuilts/runtime/mainline/update.py. See prebuilts/runtime/mainline/README.md for update instructions. This update relands the CRT objects reverted in https://r.android.com/2055896, together with an updated runtime host-exports, which has the linker binary that must go together with them. Test: env TARGET_PRODUCT=armv8 TARGET_BUILD_VARIANT=eng \ art/test/testrunner/run_build_test_target.py \ art-linux-bionic-x64 Test: banchan com.android.art && m Test: art/build/apex/runtests.sh Bug: 228187970 Change-Id: I4f04b0586dd839cdc8b3a7ae2f5bb4621967b9c1
2022-04-12Enable Bionic host-exports together with the SDK.Martin Stjernholm
They must always be dropped together. Added a comment to explain why, because the error it gives otherwise is a bit confusing (cf. b/228187970). Test: prebuilts/runtime/mainline/update.py -b aosp-master --build 8376291 env TARGET_PRODUCT=armv8 TARGET_BUILD_VARIANT=eng \ art/test/testrunner/run_build_test_target.py \ art-linux-bionic-x64 Bug: 228187970 Change-Id: Ia2d9756842cdedbf752de1437b183c75633b7320
2022-04-06Merge "Revert update of CRT objects." am: 5739413797 am: cd161d9e7f am: ↵Treehugger Robot
52089f479a am: 43b9fa0b86 am: 831abf72fa Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2055896 Change-Id: I50ebf3a3dce8ac3d3ff8aab7f0b6935d8bba4037 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Revert update of CRT objects." am: 5739413797 am: cd161d9e7f am: ↵Treehugger Robot
52089f479a am: 43b9fa0b86 Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2055896 Change-Id: Ice19a5e4370339cdb66bbaecae81aa289f64642f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Revert update of CRT objects." am: 5739413797 am: cd161d9e7f am: ↵Treehugger Robot
52089f479a Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2055896 Change-Id: Ic2a112280d6c8b74090c88a42612964a8da5a952 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Revert update of CRT objects." am: 5739413797 am: cd161d9e7fTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2055896 Change-Id: Ice617311e9e67b9875477abfcd43b3511bcc72e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Revert update of CRT objects." am: 5739413797Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2055896 Change-Id: I5eacc96ab6426f584ff8873bfc8bd90838077639 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Revert update of CRT objects."Treehugger Robot
2022-04-05Revert update of CRT objects.Martin Stjernholm
To avoid a linker problem in host bionic builds. This reverts some binaries to their state before https://r.android.com/2050775. Test: env TARGET_PRODUCT=armv8 TARGET_BUILD_VARIANT=eng \ art/test/testrunner/run_build_test_target.py \ art-linux-bionic-x64 Bug: 228187970 Change-Id: Ice807c09147f3b87ff7cd00036e8962a67e7c2b2
2022-04-04Merge "Update mainline prebuilts to build 8376291." am: ec19ae2e75 am: ↵Martin Stjernholm
c5c6ca3f70 am: 847c2f3ea3 am: e84ff2d047 am: 7338749f36 Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2050775 Change-Id: I93b0e8825a2dcc151bb71936e3da9094517597c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04Merge "Update mainline prebuilts to build 8376291." am: ec19ae2e75 am: ↵Martin Stjernholm
c5c6ca3f70 am: 847c2f3ea3 am: e84ff2d047 Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2050775 Change-Id: I2b567c5ccde054345e6411b6d3716539b0731b4c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04Merge "Update mainline prebuilts to build 8376291." am: ec19ae2e75 am: ↵Martin Stjernholm
c5c6ca3f70 am: 847c2f3ea3 Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2050775 Change-Id: Ibbe15305ce84fa87de15b929b5cfbc461d09c91b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04Merge "Update mainline prebuilts to build 8376291." am: ec19ae2e75 am: ↵Martin Stjernholm
c5c6ca3f70 Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2050775 Change-Id: Ieeba09d742dd6d69f864a06d2c9c4601665372f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04Merge "Update mainline prebuilts to build 8376291." am: ec19ae2e75Martin Stjernholm
Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2050775 Change-Id: Ic3d68b7065a531fe9b1ce3052f0f0361456bfad9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04Merge "Update prebuilt drop script for new CI build locations." am: ↵Martin Stjernholm
c941ccf2eb am: 32dd3efa7b am: ca823acf96 am: 87e93cc09b am: f3178288b2 Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2050774 Change-Id: Id78f7118c9a83df0cc4ced4ccc885890d81731ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04Merge "Update mainline prebuilts to build 8376291."Martin Stjernholm
2022-04-04Merge "Update prebuilt drop script for new CI build locations." am: ↵Martin Stjernholm
c941ccf2eb am: 32dd3efa7b am: ca823acf96 am: 87e93cc09b Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2050774 Change-Id: I0f3489e7d021e880c028c39091c29c4f3aead5e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04Merge "Update prebuilt drop script for new CI build locations." am: ↵Martin Stjernholm
c941ccf2eb am: 32dd3efa7b am: ca823acf96 Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2050774 Change-Id: I5ccd26bdbb2dd951ca714993697b02259a4e76e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04Merge "Update prebuilt drop script for new CI build locations." am: ↵Martin Stjernholm
c941ccf2eb am: 32dd3efa7b Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2050774 Change-Id: I291e5ca87b5a23c8b408fb66b855a5b78b9d9978 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04Merge "Update prebuilt drop script for new CI build locations." am: c941ccf2ebMartin Stjernholm
Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2050774 Change-Id: I737b62ec45624c47316b87407d129de6f7591b84 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04Merge "Update prebuilt drop script for new CI build locations."Martin Stjernholm
2022-03-31Update mainline prebuilts to build 8376291.Martin Stjernholm
Taken from branch aosp-master. CL prepared by prebuilts/runtime/mainline/update.py. See prebuilts/runtime/mainline/README.md for update instructions. This update is limited: - runtime/sdk is updated to incorporate new headers. This brings the SDK in sync after the userfaultfd.h header update in https://r.android.com/2025844. - libbinder_ndk in platform/sdk is updated to incorporate new headers necessary for the current AIDL compiler. ART will still default to API level 31 of the ABIs through header annotations. Test: banchan com.android.art && m Test: art/build/apex/runtests.sh Bug: 216762037 Bug: 211018812 Change-Id: I62f541ffbb840d34b415e05e182953239f78d1d7
2022-03-31Update prebuilt drop script for new CI build locations.Martin Stjernholm
Split InstallSdkEntries into the three variants required for the different types of SDKs produced by packages/modules/common/build/mainline_modules_sdks.py. InstallApexEntries and InstallSharedLibEntries are also refactored slightly, but there are currently no CI builds to support them. From now on we want to be conservative with prebuilt updates to ensure SC compatibility in these dependencies, so update the script and instructions to reflect this. Remove the --install-modules filter since it isn't granular enough, and instead comment out most modules which may not be safe to update. Test: prebuilts/runtime/mainline/update.py -b aosp-master --build 8376291 banchan com.android.art && m art/build/apex/runtests.sh Bug: 216762037 Change-Id: I95573df27bc238240d8f12acf1c313b4473be6a3
2022-03-15Merge "Add UFFDIO_CONTINUE related changes to userfaultfd.h" am: 43ae9976f0 ↵Treehugger Robot
am: 9ce470534f am: 9dd575b13b Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2025844 Change-Id: I3d9a681bdfeb2a846e786f37f7455d7925337aa0
2022-03-15Merge "Add UFFDIO_CONTINUE related changes to userfaultfd.h" am: 43ae9976f0 ↵Treehugger Robot
am: 9ce470534f Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2025844 Change-Id: I24f3887df062b9eebef1a91cd9fe7b4e00db9808
2022-03-15Merge "Add UFFDIO_CONTINUE related changes to userfaultfd.h" am: 43ae9976f0Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2025844 Change-Id: Ic0f74eb4fbb6feb9e04dd0c3ff7b6c466cf0ef27
2022-03-15Merge "Add UFFDIO_CONTINUE related changes to userfaultfd.h"Treehugger Robot
2022-03-14Add UFFDIO_CONTINUE related changes to userfaultfd.hLokesh Gidra
Update prebuilt sdk userfaultfd.h header file to include UFFDIO_CONTINUE related definitions. The files are updated from bionic(471bef4d34a666a5edfb2c0008dad89b6c6f1d76). Bug: 160737021 Test: build module on master-art using UFFDIO_CONTINUE Change-Id: Ie194c8916ec6748398bf32f886547359bbeaa4dc
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 2a68a7ccf4 -s ours am: bdba3a5248 -s ours am skip reason: Merged-In I3f1adc7efdfc8a0eb4ad302d8c1cc32ca92822a4 with SHA-1 63ba611e37 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/runtime/+/16844128 Change-Id: I935493b532ef7903a6f7a77d9760b14844b4f2a1
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 2a68a7ccf4 -s ours am skip reason: Merged-In I3f1adc7efdfc8a0eb4ad302d8c1cc32ca92822a4 with SHA-1 63ba611e37 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/runtime/+/16844128 Change-Id: Ib6e83eab1eda101c230bafbcbe2e26e13717297f
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I3f1adc7efdfc8a0eb4ad302d8c1cc32ca92822a4 Change-Id: I564bbe2b98195e33539807d59d5de37dc9220c5c
2022-01-28Merge "Add annotations zip, and system and module-lib APIs" am: c9e2af2fdb ↵Paul Duffin
am: 51527bf53f am: 1c60074cf5 am: 28efaf6e6d Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/1964930 Change-Id: I15ce51d88533e38be5ae799f84c316ea336b2643
2022-01-28Merge "Add annotations zip, and system and module-lib APIs" am: c9e2af2fdb ↵Paul Duffin
am: 51527bf53f am: 1c60074cf5 Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/1964930 Change-Id: I6fa117e19b6cc39be1a7800d67255c112b9b9221
2022-01-28Merge "Add annotations zip, and system and module-lib APIs" am: c9e2af2fdb ↵Paul Duffin
am: 51527bf53f Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/1964930 Change-Id: Id023d50466cbfc4a0adfed9ab139f7e4e2d21f2b
2022-01-28Merge "Add annotations zip, and system and module-lib APIs" am: c9e2af2fdbPaul Duffin
Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/1964930 Change-Id: Icf59dd006466c1132c14df0d4761c9fcf32203fc
2022-01-28Merge "Add annotations zip, and system and module-lib APIs"android-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-1Paul Duffin
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 09:12:34 +0000