aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 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-06Merge "Add exclude_runtime_libs to more targets." into sc-qpr1-devMartin Stjernholm
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 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-31Load env variables before c.config() am: 062b011502 am: f04dc7f1b1 am: ↵Kousik Kumar
de85899f78 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183 Change-Id: If08483b4d0702ea51f0580f92d1f176eb3b1e98e
2021-08-31Load env variables before c.config() am: 062b011502 am: ef9d91b7ac am: ↵Kousik Kumar
50c2a1b2a4 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183 Change-Id: I0bc6992644c580cbc091f9cda8864e0c2da4f470
2021-08-31Load env variables before c.config() am: 062b011502 am: f04dc7f1b1Kousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183 Change-Id: Ic0629266b7ea9b51d4a7ad2f697dd1e0cdb65051
2021-08-31Load env variables before c.config() am: 062b011502 am: ef9d91b7acKousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183 Change-Id: I5574eba839d8e186a3fff27b5198ab34ec10e1ce
2021-08-31Load env variables before c.config() am: 062b011502Kousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183 Change-Id: I13773a3be06c8ad4426960b0f2fbc45bbed3e85f
2021-08-31Load env variables before c.config() am: 062b011502Kousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183 Change-Id: I6fd005904a174ae685853fcb9303e678ab7a48d0
2021-08-31Add exclude_runtime_libs to more targets.Martin Stjernholm
Cherry-picked from https://r.android.com/1810756. Test: `m droid` with https://r.android.com/1810717 Bug: 197856821 Change-Id: I4c93ae4b1f686796827a9635ba4ed50db00e6a8c Merged-In: I4c93ae4b1f686796827a9635ba4ed50db00e6a8c
2021-08-31Load env variables before c.config()Kousik Kumar
If the env variables are loaded after the config object is created, they aren't set in the Environment object inside the config object which causes RBE to not work Bug: b/198045383 Test: Tested by running a build against rvc-dev branch and ensuring it works. Change-Id: I509289467df81e5535b4cbbfe4e5eb336c0e4e59
2021-08-19[automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: ↵Treehugger Robot
907bbdfc9f am: 46d4a14089 -s ours am: 0b7859c0d9 -s ours am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15625816 Change-Id: I74586233adc72131f77e4fb6c6ee777df07dffd2
2021-08-19[automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: ↵Treehugger Robot
907bbdfc9f am: 9ba871bbe9 -s ours am: 41a0ece7d4 -s ours am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15625816 Change-Id: I7169df1cda5f89648159bff750aea245384346a6
2021-08-19[automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: ↵Treehugger Robot
907bbdfc9f am: 46d4a14089 -s ours am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15625816 Change-Id: Ibf4e6d9cb9077871b480651137e7444670eb88ac
2021-08-19[automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: ↵Treehugger Robot
907bbdfc9f am: 9ba871bbe9 -s ours am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15625816 Change-Id: If98b1b5871568e54889b195a475d670e00030c6e
2021-08-19Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9fTreehugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15625816 Change-Id: If65b22f21e7b46113800525668598d63020c26fe
2021-08-19Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9fTreehugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15625816 Change-Id: I9e55824b4e8359eb514c6cb3d31b8e0a98c55a7d
2021-08-19Add FAILED: prefix to RBE Fatal error message"Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560871 Bug: b/195592452 Change-Id: I00e2cb26eb3e1e3b695ba067cad24f45169f3a58 (cherry picked from commit ab2803a870b02a7ba604b90897241185f8517c79) Merged-In: Ie0c9acee2739acf149384e33804b5fca3273c24f
2021-08-11Collect lint reports from apps in apexes am: 192221b55eColin Cross
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15531885 Change-Id: I013e140227377cb6226a1e771f858f11f0f17fe8
2021-08-11Collect lint reports from apps in apexesColin Cross
Lint reports were only being collected from jars in apexes, not apps. Bug: 188772607 Test: mainline_modules_arm64 build Change-Id: Ie84819343f8b8ab3f43496bbc9b7876d0d0d8e70 Merged-In: Ie84819343f8b8ab3f43496bbc9b7876d0d0d8e70 (cherry picked from commit 8355c1524fbb1d6b7b7a25a13f66feffb1aa7214)
2021-08-06Merge "Use prebuild modules even when coverage is enabled." into sc-devKun Niu
2021-08-06resolve merge conflicts of 233c1be0bdf85ae4dce75cd79ab04932be22af5b to ↵Kousik Kumar
rvc-dev am: 3c12576942 am: a907f283fc Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760 Change-Id: I42938333328a0a42f99f80ba4b53e64b33935316
2021-08-06resolve merge conflicts of 233c1be0bdf85ae4dce75cd79ab04932be22af5b to ↵Kousik Kumar
rvc-dev am: 3c12576942 am: 4d645c7791 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760 Change-Id: I5568c2f0fed211356a521bed0e26332e930bd22b
2021-08-06resolve merge conflicts of 233c1be0bdf85ae4dce75cd79ab04932be22af5b to ↵Kousik Kumar
rvc-dev am: 3c12576942 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760 Change-Id: Ied3e486f490decd767d4ae3c7c63947bf41cdc64
2021-08-06resolve merge conflicts of 233c1be0bdf85ae4dce75cd79ab04932be22af5b to ↵Kousik Kumar
rvc-dev am: 3c12576942 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760 Change-Id: I2168fdd669b5ea1b73fce690609be8293fd9069a
2021-08-05resolve merge conflicts of 233c1be0bdf85ae4dce75cd79ab04932be22af5b to rvc-devKousik Kumar
Bug: b/194679562 Change-Id: Icb42c43c1b4c8018b1402bd508271a0d4a052b14 Merged-In: I416e8da75f84aa2b53995f525cf50501488dc972
2021-08-05Use prebuild modules even when coverage is enabled.Kun Niu
Bug: 194323871 Test: local build passed. Change-Id: I94a3922453473de7d754afce4b05ac3b6ae3765d
2021-08-05Merge "Load RBE related env vars from config files" am: b3a5d18470 am: ↵Kousik Kumar
9f6fa868c5 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15454953 Change-Id: Ie1e7b2bdb392c33a286d7f52e0fee4ccf560b1b7
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 21:06:23 +0000