Commit Graph

59737 Commits

Author SHA1 Message Date
Kousik Kumar 602859b186 resolve merge conflicts of a7beb10933 to rvc-dev
Bug: b/167405184
Change-Id: Ib35af2813e7b60932df33f905d8e0398727ee545
Merged-In: I4d06b4fa190d6185b15aa98cb6f1a33f9702981e
2020-09-23 04:40:24 -04:00
Kousik Kumar 63e1c37e6f resolve merge conflicts of 22ccf36b1b to rvc-dev
Bug: b/167405184
Change-Id: Ide73513d5822670eeb16e6b4a4332d1dc77567de
Merged-In: Ic8a8adb3fffb357754384ddbf13684d944a9767e
2020-09-22 17:58:24 +00:00
Paul Scovanner 83bdf4b296 Merge "Update Security String to 2020-11-05" into rvc-dev 2020-09-21 22:57:32 +00:00
Kousik Kumar f83d417dd5 [automerger skipped] Merge changes Ic8a8adb3,Ia972c74d into qt-dev am: 94bf36bd92 am: 22ccf36b1b -s ours
am skip reason: skipped by user kousikk

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12599825

Change-Id: I74d2db25915ae9886cae6d8b5da76b0aa142b070
2020-09-21 08:15:41 +00:00
Kousik Kumar 0eff0c0851 [automerger skipped] Add RBE_CXX_COMPARE variable to locally disable compare mode for C++ am: 0118dd2f83 am: 7de98747f4 -s ours
am skip reason: Change-Id Ia972c74d804085196a7b6ec755af63042c6b3909 with SHA-1 2dcf402edc is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12599824

Change-Id: I47035b726b74e760cf42895c042059a555a110a3
2020-09-21 08:15:39 +00:00
Paul Scovanner 00d4c092a5 Update Security String to 2020-11-05
Bug: 168709737
Change-Id: I981139f21fb2ffcc9688aad02839a81ce6de6f5f
2020-09-18 20:32:40 +00:00
Kousik Kumar a7beb10933 Rename wlist to allowlist am: 73bcc38ac8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12618003

Change-Id: I572802bb8209565cfacd800f93242123b51c2354
2020-09-17 15:03:52 +00:00
Kousik Kumar 22ccf36b1b Merge changes Ic8a8adb3,Ia972c74d into qt-dev am: 94bf36bd92
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12599825

Change-Id: I3ee84b49cdaffcbc1f1ebae1e55e34aa08b5e8e8
2020-09-16 19:16:57 +00:00
Kousik Kumar 7de98747f4 Add RBE_CXX_COMPARE variable to locally disable compare mode for C++ am: 0118dd2f83
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12599824

Change-Id: I88fc811658a05340c8c16f16bcb388f5f8aba9d5
2020-09-16 19:16:55 +00:00
Paul Scovanner 727715f100 Update Security String to 2020-11-01
Bug: 168709737
Change-Id: I96489891caa4f5248c90be2d8c16327e1991e3bb
2020-09-16 19:16:48 +00:00
Kousik Kumar 73bcc38ac8 Rename wlist to allowlist
The new release of re-client renames env_var_wlist to env_var_allowlist.
We need to make this change as part of the topic so that with the new
release we are able to deprecate this variable.

Bug: b/167677318
Change-Id: I988381f4f72061f7c6eb99d58593f92cfd618b1b
Merged-In: I988381f4f72061f7c6eb99d58593f92cfd618b1b
2020-09-16 18:20:29 +00:00
Kousik Kumar 94bf36bd92 Merge changes Ic8a8adb3,Ia972c74d into qt-dev
* changes:
  Remove double quotes in rbe.mk file
  Add RBE_CXX_COMPARE variable to locally disable compare mode for C++
2020-09-16 17:49:34 +00:00
Kousik Kumar f473b50efa [automerger skipped] Merge "[DO NOT MERGE] Set RBE_DIR default value to point to prebuilts in tree." into qt-dev am: d9cf148ddb am: 4f66e75729 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12593960

Change-Id: I75567bd0c2896aa053fd7982d3f278b2a0f9b9b9
2020-09-16 07:44:33 +00:00
Ramy Medhat fb318d789b [automerger skipped] [DO NOT MERGE] Set RBE_DIR default value to point to prebuilts in tree. am: 83c95dea63 am: 32b7584983 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12593960

Change-Id: I3437bd861db3653bb24158bfcd3d0873f9278b99
2020-09-16 07:44:30 +00:00
Kousik Kumar 4f66e75729 Merge "[DO NOT MERGE] Set RBE_DIR default value to point to prebuilts in tree." into qt-dev am: d9cf148ddb
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12593960

Change-Id: Ia6bdecaab27de877c36de507d524d236dda90473
2020-09-16 07:10:53 +00:00
Ramy Medhat 32b7584983 [DO NOT MERGE] Set RBE_DIR default value to point to prebuilts in tree. am: 83c95dea63
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12593960

Change-Id: I3ea1bb99d0cd40b210f51665e48cf65d5eb7d315
2020-09-16 07:10:50 +00:00
Kousik Kumar d9cf148ddb Merge "[DO NOT MERGE] Set RBE_DIR default value to point to prebuilts in tree." into qt-dev 2020-09-16 05:12:53 +00:00
TreeHugger Robot 9bd7223ab7 Merge "Add function to export default values for RBE related variables" into rvc-dev 2020-09-15 23:30:27 +00:00
TreeHugger Robot 461c0d4620 Merge "Set RBE_DIR default value to point to prebuilts in tree." into rvc-dev 2020-09-15 23:30:18 +00:00
Kousik Kumar d17cbf752a [automerger skipped] [DO NOT MERGE] Add rbesetup.sh script to Q branch am: 45abdb21af am: c22ce3a211 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12583386

Change-Id: I2e8f70d9c915bf37a201a64bbfbc6aaf5371dc8e
2020-09-15 19:42:00 +00:00
Kousik Kumar c22ce3a211 [DO NOT MERGE] Add rbesetup.sh script to Q branch am: 45abdb21af
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12583386

Change-Id: I58c96fc206a382c7887a8c29bb1e0e612b415204
2020-09-15 19:14:55 +00:00
Kousik Kumar f037e1a969 Remove double quotes in rbe.mk file
These result in weird command line invocations when used with RBE.

Test: Ran an RBE build locally and made sure it still worked as expected
after the change.
Bug: b/163618332

Change-Id: Ic8a8adb3fffb357754384ddbf13684d944a9767e
Merged-In: Ic8a8adb3fffb357754384ddbf13684d944a9767e
2020-09-15 18:43:42 +00:00
Kousik Kumar 0118dd2f83 Add RBE_CXX_COMPARE variable to locally disable compare mode for C++
When we do 64-32 migration, we want compare mode to be present only for
non-c++ actions as it would impact performance on 32-core machines
otherwise.

Bug: b/157414300
Test: Ran a build with "RBE_CXX_LINKS="true" RBE_CXX_LINKS_EXEC_STRATEGY="remote" RBE_CXX_COMPARE="false" RBE_compare="true" use_rbe mmma bionic"
and observed that local-executions happened only for link actions and
not for C++ actions.

Change-Id: Ia972c74d804085196a7b6ec755af63042c6b3909
Merged-In: Ia972c74d804085196a7b6ec755af63042c6b3909
2020-09-15 18:35:32 +00:00
Ramy Medhat 83c95dea63 [DO NOT MERGE] Set RBE_DIR default value to point to prebuilts in tree.
The new default points to prebuilts/remoteexecution-client/live.

Also sets the default exec strategy of Javac/R8/D8 to remote local
fallback.

Bug: b/166182389
Test: simple one action build
Change-Id: I3392a0f7ac6de818d0c5ba2e113fcb035c6fa0ae
Merged-In: I3392a0f7ac6de818d0c5ba2e113fcb035c6fa0ae
2020-09-15 18:32:57 +00:00
Kousik Kumar f65ffea114 Merge "Add RBE_CXX_COMPARE variable to locally disable compare mode for C++" into rvc-dev 2020-09-14 14:25:29 +00:00
Kousik Kumar 45abdb21af [DO NOT MERGE] Add rbesetup.sh script to Q branch
Bug: b/166182389
Merged-In: I2413a3648e9b2ff680cab6fededc07bbdd43378f
Change-Id: I2413a3648e9b2ff680cab6fededc07bbdd43378f
2020-09-14 07:18:34 +00:00
Kousik Kumar d0737f00ee [automerger skipped] [DO NOT MERGE] Update configuration for RemoteExecution actions am: 136274bfaa am: 97a8b0429a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468477

Change-Id: I5dfdc502d3c03baf14354d7b23b5ff13f6f9cc86
2020-09-02 12:18:51 +00:00
Kousik Kumar 97a8b0429a [DO NOT MERGE] Update configuration for RemoteExecution actions am: 136274bfaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468477

Change-Id: I3433f0d3e24302f14c5fe317b3e49a6497572807
2020-09-02 11:39:39 +00:00
Ramy Medhat a5adf6ac81 [automerger skipped] [DO NOT MERGE] Modify D8 template to not have inputs under the output directory. am: 0ba998c376 am: a3933f760e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468476

Change-Id: I2cd992ff4acdd27e538972308bc7f8a8cab5ee3f
2020-09-02 11:16:22 +00:00
Kousik Kumar 79b71cbd76 [automerger skipped] [DO NOT MERGE] Add exec_strategy as CLI flags to all rewrapper commands am: 8b3850d8e5 am: fc82cb6c31 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468475

Change-Id: Iad13ef81cf995ac06e85df575b7ab86928997420
2020-09-02 11:16:17 +00:00
Ramy Medhat 33466e3836 [automerger skipped] [DO NOT MERGE] Add RBE support for Javac, R8, and D8 if respective env vars are set. am: c9a030aa4d am: 5507116c4a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468474

Change-Id: Ib410589e42eba5eb0cee6e61a52cf8ea30fb771a
2020-09-02 11:16:12 +00:00
Ramy Medhat 532652723e [automerger skipped] [DO NOT MERGE] Add PWD to environment variable whitelist for RBE builds. am: 77a4879e8c am: 1700189171 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468473

Change-Id: I7e074a1ea0dbede530d5cdd779b23c2a28e80a66
2020-09-02 11:16:07 +00:00
Ramy Medhat 1b09868d21 [automerger skipped] [DO NOT MERGE] Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links. am: f965526697 am: d0c6aa3e33 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468472

Change-Id: I4ebd163de5cb15131471359eedfa11714ff0a724
2020-09-02 11:16:02 +00:00
Ramy Medhat a3933f760e [DO NOT MERGE] Modify D8 template to not have inputs under the output directory. am: 0ba998c376
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468476

Change-Id: I7f218170ca51b9d7e40394cb5a91e31ea0ab26d9
2020-09-02 10:56:06 +00:00
Kousik Kumar fc82cb6c31 [DO NOT MERGE] Add exec_strategy as CLI flags to all rewrapper commands am: 8b3850d8e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468475

Change-Id: Ibd494a5572372aa6513571dcab90012803b3157f
2020-09-02 10:55:58 +00:00
Ramy Medhat 5507116c4a [DO NOT MERGE] Add RBE support for Javac, R8, and D8 if respective env vars are set. am: c9a030aa4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468474

Change-Id: I4c8226d15b6dd6676b57e4c7c4295b294903cb06
2020-09-02 10:55:51 +00:00
Ramy Medhat 1700189171 [DO NOT MERGE] Add PWD to environment variable whitelist for RBE builds. am: 77a4879e8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468473

Change-Id: I430d3db12a0c7a2bfac2d5e08ca33fb3bfd74580
2020-09-02 10:55:44 +00:00
Ramy Medhat d0c6aa3e33 [DO NOT MERGE] Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links. am: f965526697
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468472

Change-Id: I0b6627f74ffac2e170d0fa83f9c2952e25e92524
2020-09-02 10:55:38 +00:00
Ramy Medhat 428006cf4d [automerger skipped] [DO NOT MERGE] Add RBE mk file to support bootstrapping RBE and setting relevant am: 7298be1b47 am: edd7e730e3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468471

Change-Id: Ied1f9813b9c799fa601af4d5bc3e9a19dc9baf1d
2020-09-02 09:27:23 +00:00
Ramy Medhat edd7e730e3 [DO NOT MERGE] Add RBE mk file to support bootstrapping RBE and setting relevant am: 7298be1b47
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468471

Change-Id: Ib71a27f068c500b3408198cd8731fd6fddbe577c
2020-09-02 09:10:39 +00:00
Kousik Kumar 136274bfaa [DO NOT MERGE] Update configuration for RemoteExecution actions
1. Specify addition inputs needed for R8 / D8 / Javac actions so that
they can be successfully executed remotely.
2. Cleanup platform configuration so that pool-names are turned into a
common variable and re-used between javac / r8 / d8 actions.

Bug: b/152273259
Change-Id: I0231a96f6e4e094e98d0f89728f6ac3e34f78118
Merged-In: I0231a96f6e4e094e98d0f89728f6ac3e34f78118
2020-08-31 12:37:54 +00:00
Ramy Medhat 0ba998c376 [DO NOT MERGE] Modify D8 template to not have inputs under the output directory.
Test: presubmit
Bug: b/166182389
Change-Id: I800664acdeffa04ce83a8446bece411f018af2e2
Merged-In: I800664acdeffa04ce83a8446bece411f018af2e2
2020-08-31 12:37:30 +00:00
Kousik Kumar 8b3850d8e5 [DO NOT MERGE] Add exec_strategy as CLI flags to all rewrapper commands
Bug: b/148798195
Test: The same change is live in master-build-rbe-testing branch where
its not causing any behavior change, and also it works for
RemoteExecution where RBE_CXX_EXEC_STRATEGY variable is set.

Bug: b/166182389
Change-Id: I5efb1c2ab74dbe70dd70bf43d6262f2063d4d378
Merged-In: I745ed4a91c2b070048c0b1fd0881e5f4f28d0148
2020-08-31 12:36:29 +00:00
Ramy Medhat c9a030aa4d [DO NOT MERGE] Add RBE support for Javac, R8, and D8 if respective env vars are set.
Bug: b/166182389
Test: aosp_crosshatch build with and without the new variables.
Change-Id: I252ff5dd8e372edf8c86e25348c8a2bfab41d70d
Merged-In: I252ff5dd8e372edf8c86e25348c8a2bfab41d70d
2020-08-31 12:36:21 +00:00
Ramy Medhat 77a4879e8c [DO NOT MERGE] Add PWD to environment variable whitelist for RBE builds.
Test: Build aosp with USE_RBE=1.
Bug: b/166182389
Change-Id: I4b51fbde330c6129654aa74f8a58dccf62cfa11d
Merged-In: I4b51fbde330c6129654aa74f8a58dccf62cfa11d
2020-08-31 12:35:52 +00:00
Ramy Medhat f965526697 [DO NOT MERGE] Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links.
Test: Built aosp-arm64_eng with and without USE_RBE=1

Bug: b/166182389
Change-Id: I8d04069219a9467c3de9a028eb68e3115173f1e2
Merged-In: I8d04069219a9467c3de9a028eb68e3115173f1e2
2020-08-31 12:35:23 +00:00
Ramy Medhat 7298be1b47 [DO NOT MERGE] Add RBE mk file to support bootstrapping RBE and setting relevant
environment variables.

Test: Built aosp_arm-user with and without USE_RBE. With USE_RBE,
used a simple proxy script in place of rewrapper.

Bug: b/166182389
Change-Id: Ifb6bfd9f7292346f4750a6a409aa0def4e3c0363
Merged-In: Ifb6bfd9f7292346f4750a6a409aa0def4e3c0363
2020-08-31 12:34:55 +00:00
Ramy Medhat 4d158b5f32 Add function to export default values for RBE related variables
Test: ran rbesetup.sh and small build after.
Bug: b/166273085
Change-Id: I429835f1bb6da75e2fcee7e9ddac6b11672121cd
Merged-In: I429835f1bb6da75e2fcee7e9ddac6b11672121cd
2020-08-25 17:51:30 +00:00
Ramy Medhat 8f8d1126aa Set RBE_DIR default value to point to prebuilts in tree.
The new default points to prebuilts/remoteexecution-client/live.

Also sets the default exec strategy of Javac/R8/D8 to remote local
fallback.

Test: simple one action build
Bug: b/166273085
Change-Id: I3392a0f7ac6de818d0c5ba2e113fcb035c6fa0ae
Merged-In: I3392a0f7ac6de818d0c5ba2e113fcb035c6fa0ae
2020-08-25 16:31:40 +00:00
Paul Scovanner 5eec497aa4 Update Security String to 2020-10-05
Bug: 163542576
Change-Id: Id3cbd4d6528f827eba6ac410ba2eb92d91d40901
2020-08-12 19:01:02 +00:00