Commit graph

59858 commits

Author SHA1 Message Date
Colin Cross
78c70d6abc Package proguard_usage.zip files in jacoco-report-classes-all.jar
The coverage infrastructure will use the proguard_usage.zip files
to filter out classes that were stripped by R8.

Test: forrest
Bug: 170337718
Change-Id: Ia7c07770ff520aaf0a8de213edbe22d6fca5b98a
(cherry picked from commit e8ac9951d8)
2020-10-20 13:58:34 -04:00
Kousik Kumar
ee1f30a6f3 [automerger skipped] resolve merge conflicts of 22ccf36b1b to rvc-dev am: 63e1c37e6f -s ours
am skip reason: Change-Id Ic8a8adb3fffb357754384ddbf13684d944a9767e with SHA-1 f037e1a969 is in history

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

Change-Id: I83df4c83368b45717b4bed79176f5ff7a511c6dd
2020-09-22 20:52:22 +00: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
990881fffc Merge "Update Security String to 2020-11-05" into rvc-dev am: 83bdf4b296
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12640642

Change-Id: I4b507fdbb0a2bf14eca746a230ee25237c1fe610
2020-09-21 23:19:01 +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
2196632016 [automerger skipped] Merge changes Ic8a8adb3,Ia972c74d into qt-dev am: 94bf36bd92 am: 22ccf36b1b -s ours am: f83d417dd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12599825

Change-Id: I75715bea1916ea791ff6739ec176430ca3653662
2020-09-21 08:34:35 +00:00
Kousik Kumar
1fcf218ebe [automerger skipped] Add RBE_CXX_COMPARE variable to locally disable compare mode for C++ am: 0118dd2f83 am: 7de98747f4 -s ours am: 0eff0c0851 -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: If8910d306e460cae5998de7ac762100a1bfa8bea
2020-09-21 08:34:33 +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
Jaewoong Jung
f8ff981917 Deduplicate my_compat_dist entries globally.
Cherrypick of aosp/1413709

Merged-In: Ie47e355ded0ce0221988a405fc77546a4a752c38
Fixes: 164319611
Test: m TARGET_PRODUCT=aosp_x86_64 mts dist
Change-Id: Ie47e355ded0ce0221988a405fc77546a4a752c38
2020-09-18 20:48:10 +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
Paul Scovanner
6efa2695d3 Update Security String to 2020-11-01 am: 727715f100
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12617653

Change-Id: Ib5aa9fbde3f4a5f54a69501652d049ba646a552a
2020-09-17 03:51:11 +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
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
45ec8a4f4d [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: f473b50efa -s ours
am skip reason: Change-Id I3392a0f7ac6de818d0c5ba2e113fcb035c6fa0ae with SHA-1 8f8d1126aa is in history

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

Change-Id: I8254f5bc4122571c9aaa690512c94354f92b936e
2020-09-16 08:35:21 +00:00
Ramy Medhat
371870bb15 [automerger skipped] [DO NOT MERGE] Set RBE_DIR default value to point to prebuilts in tree. am: 83c95dea63 am: 32b7584983 -s ours am: fb318d789b -s ours
am skip reason: Change-Id I3392a0f7ac6de818d0c5ba2e113fcb035c6fa0ae with SHA-1 8f8d1126aa is in history

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

Change-Id: I07dc03312ad7bb649d14f59016702b53037d3ed3
2020-09-16 08:34:24 +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
67044b472c Merge "Add function to export default values for RBE related variables" into rvc-dev am: 9bd7223ab7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12445425

Change-Id: I268853978ec5baac0e4055c273801041aa805648
2020-09-16 00:34:12 +00:00
TreeHugger Robot
b1a9ea090c Merge "Set RBE_DIR default value to point to prebuilts in tree." into rvc-dev am: 461c0d4620
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12445424

Change-Id: I4983a13ec90dead4a3538dd400e173c8a574afe5
2020-09-16 00:23:57 +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
084b833223 [automerger skipped] [DO NOT MERGE] Add rbesetup.sh script to Q branch am: 45abdb21af am: c22ce3a211 -s ours am: d17cbf752a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12583386

Change-Id: I2847567a2eca906528cdf74f79bea1945a6570f5
2020-09-15 20:13:37 +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
8a3f540fb1 Merge "Add RBE_CXX_COMPARE variable to locally disable compare mode for C++" into rvc-dev am: f65ffea114
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11637205

Change-Id: Ie2ad068205b2113250ee477d5f52bbe8b37c8875
2020-09-14 15:39:19 +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
TreeHugger Robot
1026a45f6d Merge "Merged and dist lists of unused methods from R8" into mainline-prod 2020-09-02 21:55:00 +00:00
Kousik Kumar
5030123bf7 [automerger skipped] [DO NOT MERGE] Update configuration for RemoteExecution actions am: 136274bfaa am: 97a8b0429a -s ours am: d0737f00ee -s ours
am skip reason: Change-Id I0231a96f6e4e094e98d0f89728f6ac3e34f78118 with SHA-1 28e7f8cfbc is in history

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

Change-Id: Ia1b4e456b55d6c52ceda0aea8e795b63876754fc
2020-09-02 12:36:45 +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
Ramy Medhat
56a7fa32b5 [automerger skipped] [DO NOT MERGE] Modify D8 template to not have inputs under the output directory. am: 0ba998c376 am: a3933f760e -s ours am: a5adf6ac81 -s ours
am skip reason: Change-Id I800664acdeffa04ce83a8446bece411f018af2e2 with SHA-1 c3427499ca is in history

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

Change-Id: Id5511007ed3d582ebf9ea24d1870357162a30540
2020-09-02 11:54:56 +00:00
Kousik Kumar
140e419bc4 [automerger skipped] [DO NOT MERGE] Add exec_strategy as CLI flags to all rewrapper commands am: 8b3850d8e5 am: fc82cb6c31 -s ours am: 79b71cbd76 -s ours
am skip reason: Change-Id I745ed4a91c2b070048c0b1fd0881e5f4f28d0148 with SHA-1 d463007dfc is in history

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

Change-Id: Iaaee84c8c6a5e60337fbdb01245dfb61c9d33986
2020-09-02 11:54:48 +00:00
Ramy Medhat
d9815534c0 [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: 33466e3836 -s ours
am skip reason: Change-Id I252ff5dd8e372edf8c86e25348c8a2bfab41d70d with SHA-1 a9cc25d785 is in history

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

Change-Id: Ic28453d4d2fe115ff141a0d33d9f4e80a9e2dbb6
2020-09-02 11:54:43 +00:00
Ramy Medhat
4330adef5e [automerger skipped] [DO NOT MERGE] Add PWD to environment variable whitelist for RBE builds. am: 77a4879e8c am: 1700189171 -s ours am: 532652723e -s ours
am skip reason: Change-Id I4b51fbde330c6129654aa74f8a58dccf62cfa11d with SHA-1 e8de0931a1 is in history

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

Change-Id: Id62200307d518979b4e3cd1d47ce3555f19389ec
2020-09-02 11:54:36 +00:00
Ramy Medhat
9d8ad47ba8 [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: 1b09868d21 -s ours
am skip reason: Change-Id I8d04069219a9467c3de9a028eb68e3115173f1e2 with SHA-1 e5839f912b is in history

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

Change-Id: I0df24b9bd63058f77bf80f06741ff56265b27b39
2020-09-02 11:54:28 +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