Commit graph

60041 commits

Author SHA1 Message Date
Paul Scovanner
6441bc7ca3 Update Security String to 2021-01-01
Bug: 173545603
Change-Id: If6e59e48439ca692650a6ad7ad23535a8576a585
Merged-In: I273073a04d6981c5a58b3aebdf13249fdb46586e
2020-11-18 01:39:12 +00:00
Paul Scovanner
643b264940 Update Security String to 2021-01-05
Bug: 173545603
Change-Id: I273073a04d6981c5a58b3aebdf13249fdb46586e
2020-11-17 23:14:24 +00:00
Paul Scovanner
c49267765d [automerger skipped] Update Security String to 2020-12-01 am: bfe242def7 am: 72b39fb85f am: c4c139cf8a am: f96ad85d9d am: 9d2b3fa3a5 am: edefa3ea53 -s ours am: 3aa4b89bee
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12804958

Change-Id: I70dcd62ee7321883a3e175c511d790e762f74dd1
2020-11-12 06:25:00 +00:00
Paul Scovanner
7eda9880ca [automerger skipped] Update Security String to 2020-11-01 am: efacba8eef am: ec316d384e am: ee7f20037f am: fad16b3034 am: 7490ed5cee am: 7786db2615 -s ours am: c581e2d9bb -s ours
am skip reason: Change-Id I96489891caa4f5248c90be2d8c16327e1991e3bb with SHA-1 727715f100 is in history

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

Change-Id: I6e67e8dbc9712049ebf28578456e2b8d292769b1
2020-11-12 06:24:35 +00:00
Paul Scovanner
c6c0ede5e3 [automerger skipped] resolve merge conflicts of 47ba91cd62 to qt-qpr1-dev am: 952f59cccd -s ours am: 9d5a66feb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12992996

Change-Id: Ia573dd08cdc29262f9757b2c7823115dfd6e10f4
2020-11-12 06:24:14 +00:00
Paul Scovanner
94e70dcaf0 Update Security String to 2020-12-05 am: 29d48ffac5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12819559

Change-Id: I070fcebb99c2a1f8b3a65ddc8c737de814bec9a6
2020-11-12 06:23:40 +00:00
Kousik Kumar
a2734a4d32 resolve merge conflicts of 602859b186 to mainline-prod
Change-Id: Ic708c79073c7367162dd8e683ac9759f75778233
Merged-In: I988381f4f72061f7c6eb99d58593f92cfd618b1b
2020-11-11 11:31:04 -05:00
Paul Scovanner
3aa4b89bee [automerger skipped] Update Security String to 2020-12-01 am: bfe242def7 am: 72b39fb85f am: c4c139cf8a am: f96ad85d9d am: 9d2b3fa3a5 am: edefa3ea53 -s ours
am skip reason: Change-Id I61eac7915ab4b23227c3263d3f33a0f71dc3a107 with SHA-1 29d48ffac5 is in history

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

Change-Id: I97944db4a1b0241947b1f181234db1fa0d6c642a
2020-11-05 18:50:06 +00:00
Paul Scovanner
c581e2d9bb [automerger skipped] Update Security String to 2020-11-01 am: efacba8eef am: ec316d384e am: ee7f20037f am: fad16b3034 am: 7490ed5cee am: 7786db2615 -s ours
am skip reason: Change-Id I96489891caa4f5248c90be2d8c16327e1991e3bb with SHA-1 727715f100 is in history

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

Change-Id: I3d35b239bc1912ccc6fa8c3ae91b9b79498798b9
2020-11-05 18:49:59 +00:00
Paul Scovanner
9d5a66feb3 [automerger skipped] resolve merge conflicts of 47ba91cd62 to qt-qpr1-dev am: 952f59cccd -s ours
am skip reason: skipped by user pscovanner

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

Change-Id: I2a8c940a112c54a90de0972d1f08a86f46d347ad
2020-11-05 18:49:45 +00:00
Paul Scovanner
edefa3ea53 Update Security String to 2020-12-01 am: bfe242def7 am: 72b39fb85f am: c4c139cf8a am: f96ad85d9d am: 9d2b3fa3a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12804958

Change-Id: I078d443bca5896c8ff7a3e9472b2b7b3bb8b25df
2020-11-05 17:10:27 +00:00
Paul Scovanner
7786db2615 Update Security String to 2020-11-01 am: efacba8eef am: ec316d384e am: ee7f20037f am: fad16b3034 am: 7490ed5cee
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12617844

Change-Id: I6ac787306129ba452b9b73588bc1f72fa93dbf35
2020-11-05 17:10:16 +00:00
Paul Scovanner
952f59cccd resolve merge conflicts of 47ba91cd62 to qt-qpr1-dev
Update Security String to 2020-10-01
Bug: 163542576

Change-Id: Ib3ea041e914229da60487137b385933f31238089
Merged-In: I4973247ab66704c16446c47c6fd830a21ea2504f
2020-11-05 06:30:55 +00:00
Paul Scovanner
9d2b3fa3a5 Update Security String to 2020-12-01 am: bfe242def7 am: 72b39fb85f am: c4c139cf8a am: f96ad85d9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12804958

Change-Id: I16f861d8048287888e73e72e6eb0e4f82f8e07ea
2020-11-05 04:25:35 +00:00
Paul Scovanner
7490ed5cee Update Security String to 2020-11-01 am: efacba8eef am: ec316d384e am: ee7f20037f am: fad16b3034
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12617844

Change-Id: Ic26af0bc48dd5676ad2794690b3d5c305231d048
2020-11-05 04:25:19 +00:00
TreeHugger Robot
47ba91cd62 Merge "Update Security String to 2020-10-01 am: d9b732a0cb Bug: 163542576" into qt-dev 2020-11-05 04:22:12 +00:00
Paul Scovanner
dc19f1bf71 Update Security String to 2020-10-01 am: d9b732a0cb
Bug: 163542576

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

Change-Id: Ifc1e613c58f384f9b271d65ee471a62b391fdfcc
Merged-In: I4973247ab66704c16446c47c6fd830a21ea2504f
2020-11-04 22:36:47 +00:00
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
Paul Scovanner
f96ad85d9d Update Security String to 2020-12-01 am: bfe242def7 am: 72b39fb85f am: c4c139cf8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12804958

Change-Id: I3b01efd99ab7cb553221e604592a54f39d7b6fe1
2020-10-14 23:24:45 +00:00
Paul Scovanner
c4c139cf8a Update Security String to 2020-12-01 am: bfe242def7 am: 72b39fb85f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12804958

Change-Id: I49077857f43cc753df4277507679bb5911646251
2020-10-14 22:57:49 +00:00
Paul Scovanner
72b39fb85f Update Security String to 2020-12-01 am: bfe242def7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12804958

Change-Id: Ibf919a022268e0a30f0cc3b53a248279751656a5
2020-10-14 22:34:50 +00:00
Paul Scovanner
bfe242def7 Update Security String to 2020-12-01
Bug: 170492812
Change-Id: I591ddb5212425bed73ed3b03e392d4c79850e602
Merged-In: I61eac7915ab4b23227c3263d3f33a0f71dc3a107
2020-10-13 21:20:09 +00:00
Paul Scovanner
29d48ffac5 Update Security String to 2020-12-05
Bug: 170492812
Change-Id: I61eac7915ab4b23227c3263d3f33a0f71dc3a107
2020-10-12 22:01:11 +00:00
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
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
fad16b3034 Update Security String to 2020-11-01 am: efacba8eef am: ec316d384e am: ee7f20037f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12617844

Change-Id: I539881c4337fa78cdead3b5fc1229afe1f535603
2020-09-17 20:37:37 +00:00
Paul Scovanner
ee7f20037f Update Security String to 2020-11-01 am: efacba8eef am: ec316d384e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12617844

Change-Id: I1c1450cb56abd65483da13a2d3cf89967ab1e860
2020-09-17 19:43:12 +00:00
Paul Scovanner
ec316d384e Update Security String to 2020-11-01 am: efacba8eef
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12617844

Change-Id: I4fca4c04dedc5cd8e9bb6f2b7bed3b5e2797563e
2020-09-17 19:15:37 +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
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
Paul Scovanner
efacba8eef Update Security String to 2020-11-01
Bug: 168709737
Merged-In: I96489891caa4f5248c90be2d8c16327e1991e3bb
Change-Id: I2ec81773c28b4ad2e74b600dbf1bfd2503b085ea
2020-09-16 19:17:30 +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
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