aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-08Snap for 7132927 from 02aea1327276bb3ba50ed4db0ce33d56a35d2c16 to ↵android-mainline-11.0.0_r31android-mainline-11.0.0_r20android11-mainline-conscrypt-releaseandroid-build-team Robot
mainline-conscrypt-release Change-Id: I2f689c44c7c9960c64fd97db47f56d11ca95a36f
2021-02-02Add top level product definitions for module_* devices.Martin Stjernholm
Test: lunch module_{arm,arm64,x86,x86_64} Inspect target arches in the banner Bug: 176171716 Merged-In: Iba7818cfc1385d3f84dce1ef95c2bb8d279926bb Change-Id: Iba7818cfc1385d3f84dce1ef95c2bb8d279926bb
2021-01-13Snap for 7080740 from 8aec0e51b93487f775a05f061d453365c95b42ae to ↵android-build-team Robot
mainline-conscrypt-release Change-Id: I86c95c1f703a31e475f04de237a4f0e8c8475d73
2021-01-13[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to ↵TreeHugger Robot
version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d -s ours am: b4a76d1317 -s ours am: 2ff4253b5b am: b571c86e23 -s ours am: a2414b4459 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I33a72dd7646290bc3f14a3218b49b40bead355ff
2021-01-13[automerger skipped] DO NOT MERGE am: d703d4e453 -s ours am: 6be7cf235f am: ↵Paul Scovanner
f90adf9770 -s ours am: 2ce3a46193 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I426d479d3274311c21a8b448a1dd75b72e361459
2021-01-13[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to ↵TreeHugger Robot
version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d -s ours am: b4a76d1317 -s ours am: 2ff4253b5b am: b571c86e23 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5f0f16b8d8ba32a0eeaca74dfe1a101098f8a39b
2021-01-13[automerger skipped] DO NOT MERGE am: d703d4e453 -s ours am: 6be7cf235f am: ↵Paul Scovanner
f90adf9770 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id38a848923de96dc9671e12d5ed2bd8f125f2395
2021-01-13[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to ↵TreeHugger Robot
version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d -s ours am: b4a76d1317 -s ours am: 2ff4253b5b Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I643a58a7a943360410b136f8e40d62b89e9a1308
2021-01-13[automerger skipped] DO NOT MERGE am: d703d4e453 -s ours am: 6be7cf235fPaul Scovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie12d51c462daf0df846c34810dd37fe0ad6bd99f
2021-01-13[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to ↵TreeHugger Robot
version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d -s ours am: b4a76d1317 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I06a0037560251822d5e21dd53b4f521e1d5929c7
2021-01-13[automerger skipped] DO NOT MERGE am: d703d4e453 -s oursPaul Scovanner
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If6fc2e44aeee6774170036b03be3ff57955eebf5
2021-01-13[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to ↵TreeHugger Robot
version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaf980fce1aa4944e6427a383ed6abb3b1c58b401
2021-01-13Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" ↵TreeHugger Robot
into oc-mr1-dev
2021-01-13Merge "Use 64 bit binder in module builds" into mainline-prodAnton Hansson
2021-01-13Use 64 bit binder in module buildsAnton Hansson
Add a new BoardConfigModuleCommon for settings of this sort. Bug: 176840868 Test: forrest module coverage build Change-Id: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
2021-01-13DO NOT MERGEPaul Scovanner
Update OWNERS for SPL changes to version_defaults.mk Bug: 177356215 Change-Id: Icc582400ad03c9d59be0354f53072219be4de65e
2021-01-13DO NOT MERGEPaul Scovanner
Update OWNERS for SPL changes to version_defaults.mk Bug: 177356215 Change-Id: I4587ab4b0a76fea430c05209002e13ec5152ca1b
2021-01-13[automerger skipped] Update Security String to 2021-03-01 am: 0e3ba7d2f7 am: ↵Paul Scovanner
e1380bb1df am: f87e56ff8a am: 785b0ae02e -s ours am: 6baf089ea3 -s ours am skip reason: Change-Id I6d6542306c51ac1682f02cbce6701688d2bdbea2 with SHA-1 9c4665257c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13318721 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7797d387b23d51d28d27b4c860a05a555d8eb2e2
2021-01-12[automerger skipped] Update Security String to 2021-03-01 am: 0e3ba7d2f7 am: ↵Paul Scovanner
e1380bb1df am: f87e56ff8a am: 785b0ae02e -s ours am skip reason: Change-Id I6d6542306c51ac1682f02cbce6701688d2bdbea2 with SHA-1 9c4665257c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13318721 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2fb64f180da87c5fb758b19deedd1fde68631dbd
2021-01-12Update Security String to 2021-03-01 am: 0e3ba7d2f7 am: e1380bb1df am: ↵Paul Scovanner
f87e56ff8a Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13318721 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ied29b2cc0e2a5e1abc31336b03874019ef814451
2021-01-12Update Security String to 2021-03-01 am: 0e3ba7d2f7 am: e1380bb1dfPaul Scovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13318721 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4b3187f2211c7f7f5dd6a766b2d27224dea986ac
2021-01-12Update Security String to 2021-03-01 am: 0e3ba7d2f7Paul Scovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13318721 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I409580bb0eeb98a17ca9791d42d8076e8721eb2d
2021-01-12Merge "Initialize DEX_PREOPT_DEFAULT based on global dexpreopt settings." ↵Anton Hansson
into mainline-prod
2021-01-12Initialize DEX_PREOPT_DEFAULT based on global dexpreopt settings.Ulya Trafimovich
Bug: 177214554 Test: lunch cf_x86_phone-userdebug && m Test: Ensure that `find out -name dexpreopt.config` lists before and after the fix are identical (for target cf_x86_phone-userdebug). Test: TARGET_PRODUCT=mainline_modules_x86_64 \ TARGET_BUILD_VARIANT=userdebug \ build/soong/soong_ui.bash --make-mode UipbUtil Merged-In: I28b38c08ad570d53dc679f9b42975545d457416e Change-Id: I28b38c08ad570d53dc679f9b42975545d457416e (cherry picked from commit e245e00d7bf0db727958f14039efc043263e2d38)
2021-01-11Update Security String to 2021-03-01Paul Scovanner
Bug: 177091143 Change-Id: I7cfed298cb518d150ea1f944b57504f9b4578a7b Merged-In: I6d6542306c51ac1682f02cbce6701688d2bdbea2
2021-01-11Update Security String to 2021-03-05 am: 9c4665257cPaul Scovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13305148 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I795c090c7c524e65d5d0851b70019eea64b3cf7b
2021-01-08Update Security String to 2021-03-05Paul Scovanner
Bug: 177091143 Change-Id: I6d6542306c51ac1682f02cbce6701688d2bdbea2
2021-01-08Switch default execution strategy to racing for developer builds am: ↵Kousik Kumar
524428a647 am: 7a02fa7b79 am: ae8d7801bf Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292491 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibf4f61cb592a858db279b7229226499653fc46b5
2021-01-08Use unified cas uploads / downloads am: a92f3e0804 am: fb2d981a3f am: ee2bc33f24Kousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292490 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I95bdd319a901ddea2d3d51a733bc2ed0a02e349f
2021-01-08resolve merge conflicts of 0afd707045b10cac440878032a01a43512840a47 to ↵Kousik Kumar
rvc-dev am: 43889572ff Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13298010 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I971af20ac2acf73f18c4a63db7363d3c86f0797a
2021-01-08Switch default execution strategy to racing for developer builds am: ↵Kousik Kumar
524428a647 am: 7a02fa7b79 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292491 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3b81dd98bb24f96ad6491c191f43c041b9fa0885
2021-01-08Use unified cas uploads / downloads am: a92f3e0804 am: fb2d981a3fKousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292490 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iff3e0a8deba5b3054f760de183dd3e0f0380a813
2021-01-07resolve merge conflicts of 0afd707045b10cac440878032a01a43512840a47 to rvc-devKousik Kumar
Bug: b/170699893 Change-Id: Idfb7f27a3ec12843c53be51e17569583ec6f1f19
2021-01-07Switch default execution strategy to racing for developer builds am: 524428a647Kousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292491 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0895a2f8b01c54a852da9cb52a446326b72315d6
2021-01-07Use unified cas uploads / downloads am: a92f3e0804Kousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292490 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id75895d8ebe5139c32d1927c862f15429b13e3e3
2021-01-07Source rbesetup.sh from any location inside of a repo directory. am: ba9a28bee2Patrice Arruda
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292489 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie9fbb1951e8932370b7f5f856a88627f717fc78f
2021-01-06Switch default execution strategy to racing for developer buildsKousik Kumar
This is to efficiently use both local and remote resources when using RBE for Android developers. Bug: b/170699893 Change-Id: I46bc3ff9c0d8d08e8f3aaa15076eb606737355af Merged-In: I46bc3ff9c0d8d08e8f3aaa15076eb606737355af
2021-01-06Use unified cas uploads / downloadsKousik Kumar
This is to deduplciate uploads and downloads when running builds with RBE. Especially useful for certain Java / R8 / D8 actions that have JAR files as common inputs. Bug: b/170699893 Change-Id: I0459d4e5c89bd93e5c0c53195fdabccabec08674 Merged-In: I0459d4e5c89bd93e5c0c53195fdabccabec08674
2021-01-06Source rbesetup.sh from any location inside of a repo directory.Patrice Arruda
The current rbesetup.sh has to be source from the root directory of the checked out repo since it has a relative path to the sourced build/envsetup.sh script. A function was written in rbesetup.sh script to source the rbesetup.sh script anywhere inside of a checked out repo. Added additional error checking to validate the envsetup.sh is available and not to continue sourcing the script if envsetup.sh script is not found. Fixes: b/169438960 Test: Sourced the rbesetup script from * external directory * inside of a symlink * outside of repo (sourcing fails which is correct) * root repo Change-Id: I2db66a444074adca4d4ab87b8786e9044a3646f8 Merged-In: I2db66a444074adca4d4ab87b8786e9044a3646f8
2020-12-16Merge "Add devices suitable for single-arch module builds" into mainline-prodAnton Hansson
2020-12-15Add devices suitable for single-arch module buildsAnton Hansson
Prior to this the generic_* devices were typically used for this purpose. There are a few reasons to create new specific ones: - the generic_arm64 device has a hack specifically for building multi-arch packages that we want to avoid - the generic_* devices include a bunch of emulator config that does not make sense for unbundled builds Bug: 172256440 Test: verify unbundled builds migrated from generic_* don't change Merged-In: Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b Change-Id: Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b
2020-12-15[automerger skipped] Update Security String to 2021-02-01 am: ad7b650e2d am: ↵Paul Scovanner
ffc4671fce am: e1b0fa94d3 am: ad55b25e81 -s ours am: 3ab6aebc86 -s ours am skip reason: Change-Id I6a1139d288c24a11289fc53c9022fd6d70acd8e6 with SHA-1 d4d46ab023 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13219376 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia98db966db73f93782eae562ee5e6b681eabc5b5
2020-12-14[automerger skipped] Update Security String to 2021-02-01 am: ad7b650e2d am: ↵Paul Scovanner
ffc4671fce am: e1b0fa94d3 am: ad55b25e81 -s ours am skip reason: Change-Id I6a1139d288c24a11289fc53c9022fd6d70acd8e6 with SHA-1 d4d46ab023 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13219376 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibceff73843f7106c5219786032454de44c414f41
2020-12-14Update Security String to 2021-02-01 am: ad7b650e2d am: ffc4671fce am: ↵Paul Scovanner
e1b0fa94d3 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13219376 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I46824f2d45d2587956f01104d5e774daaa6b0c42
2020-12-14Update Security String to 2021-02-01 am: ad7b650e2d am: ffc4671fcePaul Scovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13219376 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I258d82e7d0a16c94689806168a7a6b02fcbb7897
2020-12-14Update Security String to 2021-02-01 am: ad7b650e2dPaul Scovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13219376 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia1c80993bc1c84ec49fea5d3386e02b91eb8cf06
2020-12-14Update Security String to 2021-02-01Paul Scovanner
Bug: 175313938 Change-Id: I6d6c4a8d4f3e80c40754670ae60718aa42c3265d Merged-In: I6a1139d288c24a11289fc53c9022fd6d70acd8e6
2020-12-14Merge "Add bootclasspath config to its own makefile" into mainline-prodAnton Hansson
2020-12-14Update Security String to 2021-02-05 am: d4d46ab023Paul Scovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13202277 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie1e4652ee08b25c23f01a04564e84d8aa93164b0
2020-12-10Merge "Merge "Update mts task to make mts-${MODULE} test suites" am: ↵Kimberly Kreider
961ef44f0b" into mainline-prod
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 14:03:16 +0000