aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-13Snap for 8071527 from 340b39da381643af6fc0776a6787ce6a194ab0e9 to sc-d2-releaseandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-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_r12android12L-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-releaseAndroid Build Coastguard Worker
Change-Id: I2cbed3e725526e103147bf5687570d1bbe13cc6e
2022-01-11[automerge] Revert "Time out and dump stacks from R8 processes after 30 ↵android12L-devColin Cross
minutes" 2p: b18a037fc6 am: 44c522badf Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16426550 Change-Id: Icf53dbe05f00dad699ea1f8ce968f2afa3b78235
2021-12-13[automerge] Revert "Time out and dump stacks from R8 processes after 30 ↵Colin Cross
minutes" 2p: b18a037fc6 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16426547 Bug: 207767452 Change-Id: I33de7faa8e8727e113a7baccb58da00d532eb330 Merged-In: Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3
2021-12-08Revert "Time out and dump stacks from R8 processes after 30 minutes"Colin Cross
This reverts commit 29c294b2cfb778b77a1556511ba53414254ddbab. The deadlock in R8 was fixed, and the timeout causes problems when RBE is enabled and the R8 action gets stuck in a queue for 30 minutes. Bug: 207767452 Test: checkbuild Change-Id: Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3 Merged-In: Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3 (cherry picked from commit a832a04db24683228ab60c86fa17cf343168cb70)
2021-11-06Snap for 7891132 from 08dd45a3b5b20759c5bff79a697a6d11bf973d23 to sc-d2-releaseAndroid Build Coastguard Worker
Change-Id: I95bbde9f405b62330b31d2eeea5507188a9a9799
2021-11-06Snap for 7889170 from b7de10739fca89220da03307a3228b32284bd65c to sc-d2-releaseAndroid Build Coastguard Worker
Change-Id: I597f7c9ffde77aef3651a5f87350fc1852da6035
2021-11-05S V2 is now 32Michael Wright
Bug: 204295952 Test: N/A Change-Id: Ib13f30c27cf79c2903e05d3c2cd27d79c4a28668 Merged-In: Ib13f30c27cf79c2903e05d3c2cd27d79c4a28668
2021-11-02rust: Remove libtest from stdlibs listIvan Lozano
libtest does not need to be linked for every module type, so remove it from the stdlibs list. Instead, link it only when building benchmarks or tests. Bug: 193782599 Test: cd external/rust/crates/; mma Test: Rust tests still run correctly. Merged-In: I536be8754da0987e09340744d9ebf668b8e734d0 Change-Id: I536be8754da0987e09340744d9ebf668b8e734d0
2021-10-19Snap for 7838477 from 9db406c81121730ffa54176be19745e2996e64a7 to sc-d2-releaseAndroid Build Coastguard Worker
Change-Id: I9e0b98ea72965c9dea91f8f928de223bf74511db
2021-10-19Up per-product memory usage to 30 GBColin Cross
Reduce multiproduct_kati parallelism by upping required memory per product to 30 GB. Bug: 201671935 Test: builds Change-Id: Ia756f309459d28e22a49f190a5227a139b356a1f Merged-In: Ia756f309459d28e22a49f190a5227a139b356a1f
2021-10-13Snap for 7821078 from b9b436fe17802e1a73e44e27e4a53a5b35b63578 to sc-d2-releaseAndroid Build Coastguard Worker
Change-Id: I47d7df1e9e209d9451cc44bcbe24c21cb8dc8102
2021-10-12Added src and exclude_src to debuggable buildsJay Aliomer
Fixes: 200976245 Test: manually tested Change-Id: I68b6230f30aa2c15e6a80010cd639ea453b4b29e Merged-In: I68b6230f30aa2c15e6a80010cd639ea453b4b29e (cherry picked from commit 85a8afa9e72feff6d804c5d0a0827db63cb55fb9)
2021-10-09Snap for 7809322 from bee6271909635fc3bd9c7d55d09a35e7707680f8 to sc-d2-releaseAndroid Build Coastguard Worker
Change-Id: Ida2d8d6f66f9d93f6c8bffe9f59626311b369b5c
2021-10-05Add {.aar} support for android_librarySaeid Farivar Asanjan
Bug: 199548380 Test: manually Change-Id: I2c392d3dfc545c23495b03d0f236680fd59e1401
2021-09-11Snap for 7721244 from 495a34493a4241796183066513d367d34dd2cccf to sc-d2-releaseAndroid Build Coastguard Worker
Change-Id: I8f0a13c11ee92aed349d36a0edce723c8c82dde1
2021-09-09Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev ↵Kousik Kumar
am: 9ecad7478f am: ecd9666a57 am: 2bdd2b278e am: 8341deb813 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291 Change-Id: I55f517832526a1f4229ad93b33a8bed967346a71
2021-09-09Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev ↵Kousik Kumar
am: 9ecad7478f am: dd28ec5116 am: ea62b3d743 am: afe8619e1b Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291 Change-Id: Ia17a5c2aa52856a81e3a630e2d15c859c555ebca
2021-09-09Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev ↵android-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseKousik Kumar
am: 9ecad7478f am: ecd9666a57 am: 2bdd2b278e Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291 Change-Id: I24aff96a3e26e2ea6077f243b207f8f99b06e010
2021-09-09Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev ↵Kousik Kumar
am: 9ecad7478f am: dd28ec5116 am: ea62b3d743 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291 Change-Id: I82ea559e164493d246102f97aa1e432f5d124fe8
2021-09-09Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev ↵Kousik Kumar
am: 9ecad7478f am: ecd9666a57 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291 Change-Id: I7ebf5bccaf33afa666eb593e3abffaad818e61a3
2021-09-09Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev ↵Kousik Kumar
am: 9ecad7478f am: dd28ec5116 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291 Change-Id: I67da3dc3c8c11d25ebc59ab01681029e5682f072
2021-09-09Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev ↵Kousik Kumar
am: 9ecad7478f Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291 Change-Id: I16a1ac3a5fac8be17ff4ef923422797cd4dff026
2021-09-09Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev ↵Kousik Kumar
am: 9ecad7478f Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291 Change-Id: I432a96406905bf64a1bad06ec0c902d372802346
2021-09-09Merge "Revert "Revert "Load env variables before c.config()""" into rvc-devKousik Kumar
2021-09-09[automerger skipped] Resolve merge conflicts of "Check UseRBE is set before ↵Kousik Kumar
replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 am: 274c905be6 -s ours am: 074000ec27 -s ours am: 1784e3d638 -s ours am skip reason: Merged-In I6df58b4e700f0d231367af2710672d731d20a736 with SHA-1 16f23a4038 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183 Change-Id: Iac7c5e1393045462cabd50054dcdcec21a902e31
2021-09-09[automerger skipped] Resolve merge conflicts of "Check UseRBE is set before ↵Kousik Kumar
replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 am: b24137e0cf -s ours am: a219d88704 -s ours am: 3d49fec2c1 -s ours am skip reason: Merged-In I6df58b4e700f0d231367af2710672d731d20a736 with SHA-1 16f23a4038 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183 Change-Id: I0edb54dd1332a387d8df5aa1098267cac4d2bc00
2021-09-09[automerger skipped] Resolve merge conflicts of "Check UseRBE is set before ↵Kousik Kumar
replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 am: 274c905be6 -s ours am: 074000ec27 -s ours am skip reason: Merged-In I6df58b4e700f0d231367af2710672d731d20a736 with SHA-1 16f23a4038 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183 Change-Id: I1ca43ce5250b7c71961a5aaa29beab22e0a14276
2021-09-09[automerger skipped] Resolve merge conflicts of "Check UseRBE is set before ↵Kousik Kumar
replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 am: b24137e0cf -s ours am: a219d88704 -s ours am skip reason: Merged-In I6df58b4e700f0d231367af2710672d731d20a736 with SHA-1 16f23a4038 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183 Change-Id: Id5650e0382cf69a6ca56782423091c201676baae
2021-09-09[automerger skipped] Resolve merge conflicts of "Check UseRBE is set before ↵Kousik Kumar
replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 am: 274c905be6 -s ours am skip reason: Merged-In I6df58b4e700f0d231367af2710672d731d20a736 with SHA-1 16f23a4038 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183 Change-Id: I3eb0185606e171767f27b083e8f8099bbee3bc7d
2021-09-09[automerger skipped] Resolve merge conflicts of "Check UseRBE is set before ↵Kousik Kumar
replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 am: b24137e0cf -s ours am skip reason: Merged-In I6df58b4e700f0d231367af2710672d731d20a736 with SHA-1 16f23a4038 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183 Change-Id: I8e61011963f661e219b5f4587c777423d2265865
2021-09-09Resolve merge conflicts of "Check UseRBE is set before replacing any ↵Kousik Kumar
template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183 Change-Id: I181bb735aaf2c3c51982f3f0d50497e3ba5184be
2021-09-09Resolve merge conflicts of "Check UseRBE is set before replacing any ↵Kousik Kumar
template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183 Change-Id: Ie310a0529d5c3c90f5dba61ddc736edd4569ee13
2021-09-08Revert "Revert "Load env variables before c.config()""Kousik Kumar
This reverts commit 4e88859af01376b9977bcc03174c182353c172d4. Reason for revert: Given https://googleplex-android-review.git.corp.google.com/c/platform/build/soong/+/15747538, we should be able to rollforward with this now. Bug: b/198045383 Change-Id: I4c069e952d9f77258433b5059f3867293993a64d
2021-09-07Resolve merge conflicts of "Check UseRBE is set before replacing any ↵Kousik Kumar
template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15747538 Bug: b/198045383 Merged-In: I6df58b4e700f0d231367af2710672d731d20a736 Change-Id: Ide5966e039ae5232438946fa064d8621088bc1ee
2021-09-07Merge "Check UseRBE is set before replacing any template with the RE ↵Kousik Kumar
version." am: 3e0b9c031c am: 4e2977ee81 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15747538 Change-Id: Ifa33cdad01dac8e81724d97f6373b745ff775ca9
2021-09-06Snap for 7708232 from d50c559c57cf0ea180e8bb1e73abbc558bd239e2 to sc-d2-releaseAndroid Build Coastguard Worker
Change-Id: I4c4fb1fdc2a12543e63049ec1e6c22f9e96aa4c5
2021-09-06Merge "Add exclude_runtime_libs to more targets." into sc-qpr1-dev am: ↵Martin Stjernholm
c3d9e36be3 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15727048 Change-Id: I5db34c69965d69cd3cd2c8b3edb6e2bc68834a9f
2021-09-06Merge "Add exclude_runtime_libs to more targets." into sc-qpr1-devMartin Stjernholm
2021-09-02Snap for 7697873 from 27a8b4640acc7e34341c572f6aa5deb5114fe4d3 to sc-d2-releaseAndroid Build Coastguard Worker
Change-Id: Ic358b679bc734af6de91d52c03bc955d52fd0a7f
2021-09-02Merge "Check UseRBE is set before replacing any template with the RE ↵Kousik Kumar
version." am: 3e0b9c031c Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252 Test: 1. Applied https://googleplex-android-review.git.corp.google.com/c/platform/build/soong/+/15723183, confirmed that the build fails on rvc-dev (by running `USE_RBE=false m `) 2. Subsequently applied this patch and tested to confirm that the failure is fixed (by running `USE_RBE=false m out/soong/.intermediates/vendor/qcom/sm7250/proprietary/commonsys/qcrilOemHook/qcrilmsgtunnel/android_common/combined/qcrilmsgtunnel.jar` and `USE_RBE=true m out/soong/.intermediates/vendor/qcom/sm7250/proprietary/commonsys/qcrilOemHook/qcrilmsgtunnel/android_common/combined/qcrilmsgtunnel.jar`). Bug: b/198045383 Merged-In: I6df58b4e700f0d231367af2710672d731d20a736 Change-Id: I52b7a3810fdf3314ae107f4b8330e9d6f62c6302 (cherry picked from commit f15ed4fe6116a60a9518a8c8ca193da1b4439d62)
2021-09-02Revert "Load env variables before c.config()" am: 4e88859af0 am: 9ee45ad09a ↵Kousik Kumar
am: fb58d3aaaf am: b4d9316616 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350 Change-Id: I25f3f3bc67bdafdbfc9bcac7219ca0ea2461c7f5
2021-09-02Revert "Load env variables before c.config()" am: 4e88859af0 am: 51c318f403 ↵Kousik Kumar
am: e41ee225ae am: 8c1a61a30f Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350 Change-Id: I05a70f3e67d1ac3638d0c113ba3787c276e97b09
2021-09-02Revert "Load env variables before c.config()" am: 4e88859af0 am: 9ee45ad09a ↵Kousik Kumar
am: fb58d3aaaf Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350 Change-Id: Ib86ba32c3974574751241a7584b569086176a9b9
2021-09-02Revert "Load env variables before c.config()" am: 4e88859af0 am: 51c318f403 ↵Kousik Kumar
am: e41ee225ae Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350 Change-Id: I1566f5e15e1a28da20c4c7c37bd097c954528ffb
2021-09-02Revert "Load env variables before c.config()" am: 4e88859af0 am: 9ee45ad09aKousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350 Change-Id: I76d4eecf6acd51462d6682e878f57c43b6f4a548
2021-09-02Revert "Load env variables before c.config()" am: 4e88859af0 am: 51c318f403Kousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350 Change-Id: Ia229ea5263a3456015ad2d446ce9f77f5e7639d0
2021-09-02Revert "Load env variables before c.config()" am: 4e88859af0Kousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350 Change-Id: I954c16917928fe1e4eace7209558b42d517c14ab
2021-09-02Revert "Load env variables before c.config()" am: 4e88859af0Kousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350 Change-Id: I3eb5b3b7175135616eca41935ec472339c83f666
2021-09-01Revert "Load env variables before c.config()"Kousik Kumar
This reverts commit 062b01150268a75aad27693bbf29416b4da651d5. Reason for revert: This change is accidentally opting in a bunch of people into RBE because we aren't respecting USE_RBE variable in rvc-dev branch (possibly missing cherry-pick of some earlier fix). Merged-In: I416e8da75f84aa2b53995f525cf50501488dc972 Change-Id: Ic678b63b165deb3ac4ec3d3c5cbc166621d8eec3
2021-08-31Snap for 7691524 from b421756b527b6c664460e331cd081e3d57c51698 to sc-d2-releaseAndroid Build Coastguard Worker
Change-Id: I0f5a26d06b8bc90ceaeb9788cafeed731b36d6fe