merge spl #1
Open
merge spl #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Change-Id: Ib8bf8f55cd4f7ef21c4fa1c85f5075f9fea891bb
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
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
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
Change-Id: I785085007598be2fe4bd581e1b3c15d2f03bb970
Change-Id: I35202001fa4bcd6b06847c5277125f7ffc303b72
Change-Id: Id054f7b4ce76cf368d70804a6ac0234a37dc1384
Change-Id: I93f48e8d7c1756c7601d38118eb21c2a9d7e39a0
Change-Id: Ifc8415251c32c3a924c04e86a2b0bcad8eb3a2b0
Change-Id: I8b8d31e8025655757b4e97e42b0ccf30308deb4a
Change-Id: I047051e20475a4191fc8e2fa8807e36fa869f441
…a9a28b Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292489 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie9fbb1951e8932370b7f5f856a88627f717fc78f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292490 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id75895d8ebe5139c32d1927c862f15429b13e3e3
…24428a Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292491 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0895a2f8b01c54a852da9cb52a446326b72315d6
Bug: b/170699893 Change-Id: Idfb7f27a3ec12843c53be51e17569583ec6f1f19
Change-Id: I40fd2737d3aab82b3942af3c6ede3f0645815eae
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292490 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iff3e0a8deba5b3054f760de183dd3e0f0380a813
…24428a am: 7a02fa7 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292491 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3b81dd98bb24f96ad6491c191f43c041b9fa0885
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13298010 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib1318979aa7519605304e0d035a0423f6af8ad51
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292490 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I10dd98679fefd07aa629c479d2a660b376ae431d
…24428a am: 7a02fa7 am: ae8d780 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292491 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I77a5aae0a98a3728b9bd554a6948f6a61b747c0d
Bug: 177091143 Change-Id: I6d6542306c51ac1682f02cbce6701688d2bdbea2
Change-Id: I11d0b732d783a404fd79c545b1972f1398059cc0
Change-Id: I5e6720a1711f72ac8e4871e57b74819fd3f372f0
Change-Id: Id45b2a44de475a586bdd73294907bc902c6e9569
Change-Id: Icdad2ad5efd0e779f189b067cc3c596a236b066c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13919906 Change-Id: I394bbc8fe09f0ef637e82685845e4eca1ba0112e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13919906 Change-Id: I940aee102ed107695cee2e3820034a2ad748ec35
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13919906 Change-Id: If819171b89f0ddd8b72357e0ab8671b1ee741021
…am: 74a0816 am: 7a1fd13 am: d932897 -s ours am skip reason: skip tag Change-Id Ica626a3b19e5b642807234c288428cd7e0f40f98 with SHA-1 321db2f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13919906 Change-Id: Ifc8531a0881951045dbd0d5148af5486766a2937
…am: 74a0816 am: 7a1fd13 am: d932897 -s ours am: 3361774 -s ours am skip reason: skip tag Change-Id Ica626a3b19e5b642807234c288428cd7e0f40f98 with SHA-1 321db2f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13919906 Change-Id: I4c6260cfda61879c754c890e9207764f4480cba4
Change-Id: I39ecaf3f17c2fa2a3450fa6f7e03fc54ae56ebdf
Change-Id: Icd666deabf1bcc60104b45b4442ed7bb74b4cdb9
Change-Id: I7de6e7b78e6740ce70bae3b97ef51aaf53e5c648
Change-Id: I960888c4c8eb6efedbdf948adad20671c26edb65
Change-Id: I31eddd02a3af275e5bdc553bebe27322d17e2e3a
Change-Id: If710962ba53cf05b6b19735ebb08f24151393cc0
Change-Id: I73ac55616d7bdccefa9a1924c81275b0439185a9
Change-Id: Ie1248179db7913171df3b38955bba8b472401709
Change-Id: I50bb3a44f45c1550c9412b5a262f54100e724344
Change-Id: I6d2a580db7fb3d31da8ff10977a9238202db92d3
Change-Id: I6cb4d4f1644699a3f4ebd424708d9624dfb0c486
Change-Id: Ida8b54f610e1e43b230b4a8b6b2cff567934dfdb
Change-Id: Id299af2248ff09d8b2d62f1102103f09467693dd
Change-Id: I896dc42c1de099dd674cfc0bfdca3be6c34e0779
Change-Id: I0bca86140b2ae19d930716d8e5bdce85a5665fc7
Change-Id: I0264fe41f5cdaabce5fb4ee0eeca9edc21842a91
Bug: 185154903 Change-Id: Ibfaf0bcc7e4525786eca62cafc7548030be40c61 (cherry picked from commit deaeaec)
Change-Id: I8e8041b5ec3e6fe75a8c542560d23d1faedf4993
Change-Id: Ib37ccd47003563d822c2a7db0ccda0aa849bbb5b
Change-Id: I3c5f771704cd119c8c6cd02ac0f39f4d97962e25
Change-Id: Ia3a92ef50195dd6e2b7c148a177f1106c9aa9c82
Change-Id: I0fe83d1fcfadaf598c230fd703807c475de976c1
…atform/build into upstream Android 11.0.0 Release 38 (RQ3A.210605.005)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.