Melisa Carranza Zúñiga
93fa6589df
Merge "Revert "Merge "Adding flags and logic to sign updateable SEPolicy in APEX" am: 77c1dfa6d9
am: 5a0d81a0be
am: 54e08307dc"" into tm-dev
2022-04-13 20:36:42 +00:00
Steve Berbary
404ae84950
[automerger skipped] Update Security String to 2022-06-01 am: ff8d7d7825
am: 92e198169e
am: 60b2df3993
am: db8f5e169f
am: 2c9b20bb14
am: 984c0914a7
-s ours
...
am skip reason: Merged-In Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c with SHA-1 ee052ac0e5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615363
Change-Id: I82384f7c6edfb5bfaf6e0ed5ca39ea0d6c7d4ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 19:49:42 +00:00
Steve Berbary
984c0914a7
Update Security String to 2022-06-01 am: ff8d7d7825
am: 92e198169e
am: 60b2df3993
am: db8f5e169f
am: 2c9b20bb14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615363
Change-Id: Ie6f02bb647d15da40cd411c17f1720f3154acd71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 19:33:19 +00:00
Steve Berbary
2c9b20bb14
Update Security String to 2022-06-01 am: ff8d7d7825
am: 92e198169e
am: 60b2df3993
am: db8f5e169f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615363
Change-Id: I96b3ee375123e21e8a4c579f04e8680a653f0422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 19:09:01 +00:00
Steve Berbary
db8f5e169f
Update Security String to 2022-06-01 am: ff8d7d7825
am: 92e198169e
am: 60b2df3993
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615363
Change-Id: I4dd22b07c42c97b6d2cfc32e8a764dd10397bc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 18:45:39 +00:00
Steve Berbary
60b2df3993
Update Security String to 2022-06-01 am: ff8d7d7825
am: 92e198169e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615363
Change-Id: I3ff0f3cb0dd72abe5eb9274653cddb53d1dac245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 18:22:45 +00:00
Steve Berbary
92e198169e
Update Security String to 2022-06-01 am: ff8d7d7825
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615363
Change-Id: I6ab2d9b65e8166c0c3bcd8356dee7bc2c47fa0e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 18:01:52 +00:00
Melisa Carranza Zúñiga
61e1dd0da5
Revert "Merge "Adding flags and logic to sign updateable SEPolicy in APEX" am: 77c1dfa6d9
am: 5a0d81a0be
am: 54e08307dc"
...
This reverts commit 8fe9e3a2c7
.
Reason for revert: Updateable SEPolicy is punted.
Change-Id: I28ae2afbb1083e215f4e0a27a9164133cd73dd76
2022-04-13 16:23:45 +00:00
Melisa Carranza Zúñiga
ef72d2822e
Merge "Revert "Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0
am: bd8c313275
am: a2db49becd"" into tm-dev
2022-04-13 13:51:51 +00:00
Melisa Carranza Zúñiga
69e6d82106
Revert "Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0
am: bd8c313275
am: a2db49becd"
...
This reverts commit 6e6c22c70e
.
Reason for revert: Updateable SEPolicy is punted.
Change-Id: I99524d13811028a4036aa85c74cf10974fe08165
2022-04-12 23:22:11 +00:00
Treehugger Robot
f18826ae8c
Merge "Put javac, d8 and r8 rules into RBE ninja pool" am: 7bc6d0e71d
am: ffa398e6a2
am: a98fd151ea
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2059990
Change-Id: I7cd8b1c59323e9deb314e8f2d9b17e4d8a57bd80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:19:48 +00:00
Treehugger Robot
a98fd151ea
Merge "Put javac, d8 and r8 rules into RBE ninja pool" am: 7bc6d0e71d
am: ffa398e6a2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2059990
Change-Id: I5112f75f2edc2701819592fbca88d28bdbd5bee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:59:51 +00:00
Treehugger Robot
ffa398e6a2
Merge "Put javac, d8 and r8 rules into RBE ninja pool" am: 7bc6d0e71d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2059990
Change-Id: I54635a2f6372bd81ab082a8b0ad07c8ceb5f8da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:43:57 +00:00
Treehugger Robot
7bc6d0e71d
Merge "Put javac, d8 and r8 rules into RBE ninja pool"
2022-04-12 14:27:24 +00:00
Jeff Hamilton
9742b1eb9f
Merge changes from topic "presubmit-am-a5f5938f12924a3c9c42aad60c88563d" into tm-dev
...
* changes:
[automerged blank] DO NOT MERGE: Change the build ID to M_2022_05. 2p: 5e9086d9e1
DO NOT MERGE: Change the build ID to M_2022_05.
2022-04-11 23:37:14 +00:00
Treehugger Robot
d816479292
Merge "Remove unused combine-notice-files macro." am: 2f6aa08f69
am: 5324ea0ca6
am: 2de37f9424
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2055032
Change-Id: I2751ba90417c8960ab5539f2fe181c66b4c69b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:43:39 +00:00
Treehugger Robot
fdfbd833eb
Merge "Non-module targets." am: ff15a27bd7
am: 7c30a61bc6
am: 6687e127b0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2055031
Change-Id: I5a6aa6499b4c39a8933ffee3d622023f2e8e0bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:43:09 +00:00
Treehugger Robot
2de37f9424
Merge "Remove unused combine-notice-files macro." am: 2f6aa08f69
am: 5324ea0ca6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2055032
Change-Id: I05a20192bdbb375729a7b19fa0215b5223bc4727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:26:52 +00:00
Treehugger Robot
6687e127b0
Merge "Non-module targets." am: ff15a27bd7
am: 7c30a61bc6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2055031
Change-Id: I3ee4934b40b57652945d81dea7a3f63b495ae5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:26:21 +00:00
Treehugger Robot
5324ea0ca6
Merge "Remove unused combine-notice-files macro." am: 2f6aa08f69
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2055032
Change-Id: Iae8c43ab5fa0236b75b98baa34ab429ab4051a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:11:51 +00:00
Treehugger Robot
7c30a61bc6
Merge "Non-module targets." am: ff15a27bd7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2055031
Change-Id: I188d24d5bcfbd11d5ad1b894e3ddc211a882d48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:11:01 +00:00
Treehugger Robot
2f6aa08f69
Merge "Remove unused combine-notice-files macro."
2022-04-11 19:42:48 +00:00
Treehugger Robot
ff15a27bd7
Merge "Non-module targets."
2022-04-11 19:42:29 +00:00
TreeHugger Robot
97ca005658
Merge changes from topic "presubmit-am-286363504fe543f8a04966cf7cc71a4b" into sc-v2-dev-plus-aosp am: 31d5f5bb57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615283
Change-Id: Iee3240448514a7486bbc66427f6bd5bfdb045af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 19:37:43 +00:00
TreeHugger Robot
31d5f5bb57
Merge changes from topic "presubmit-am-286363504fe543f8a04966cf7cc71a4b" into sc-v2-dev-plus-aosp
...
* changes:
[automerge] Update Security String to 2022-06-05 2p: ed13206d0e
Update Security String to 2022-06-05
2022-04-11 19:01:43 +00:00
Treehugger Robot
ed826115b7
Merge "revert addition of --skip-soong-test flag" am: 9bc50689c9
am: 3cbef527f0
am: def5eefbb7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2060119
Change-Id: I7f60617cc3da425444049cb8f7786a858181f3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 17:22:14 +00:00
Treehugger Robot
def5eefbb7
Merge "revert addition of --skip-soong-test flag" am: 9bc50689c9
am: 3cbef527f0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2060119
Change-Id: I89a5e5ed3b1f26ce082ebfb412682446af3c0812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 17:01:08 +00:00
Treehugger Robot
3cbef527f0
Merge "revert addition of --skip-soong-test flag" am: 9bc50689c9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2060119
Change-Id: I5bea9a572c1257509131f042df2efc196cd87fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 16:37:41 +00:00
Treehugger Robot
9bc50689c9
Merge "revert addition of --skip-soong-test flag"
2022-04-11 16:14:35 +00:00
Presubmit Automerger Backend
9514cd4f68
[automerged blank] DO NOT MERGE: Change the build ID to M_2022_05. 2p: 5e9086d9e1
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17654271
Bug: 226559955
Change-Id: If407d2fc77ecc492f0fdd9608197c166339756ea
2022-04-11 13:55:49 +00:00
Jeff Hamilton
5e9086d9e1
DO NOT MERGE: Change the build ID to M_2022_05.
...
This manual step will ensure all modules
built with this CL will work around
the APK-in-APEX cache issue for the
M-2022-05 release.
Bug: 226559955
Test: build com.google.android.permission, check names with deapexer
Change-Id: Ide67340df79d7ac6d1d2bb09b2dfad42ba757ba1
2022-04-11 13:55:44 +00:00
Albert Martin
edaea15875
[automerger skipped] Merge "Add flag to globally override updateable apexes' min_sdk_version" am: 7366fcbca6
am: e84e7041e2
am: 28c7f40837
-s ours
...
am skip reason: Merged-In I8edf09ca3c91ee52e9c2138c71d9b155b4448f66 with SHA-1 b42ddf95d1
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2059368
Change-Id: Ie7b69b8cb04b9b231fa1c5de37778dc2fc1987ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 13:38:47 +00:00
Albert Martin
28c7f40837
Merge "Add flag to globally override updateable apexes' min_sdk_version" am: 7366fcbca6
am: e84e7041e2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2059368
Change-Id: I79d9bfc8c1805123dd7e599c37e998408ac5e081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 13:17:55 +00:00
Albert Martin
e84e7041e2
Merge "Add flag to globally override updateable apexes' min_sdk_version" am: 7366fcbca6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2059368
Change-Id: I87968a9fd420f9739d61c93e996217326d33e828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 12:48:42 +00:00
Albert Martin
7366fcbca6
Merge "Add flag to globally override updateable apexes' min_sdk_version"
2022-04-11 12:29:09 +00:00
Sam Delmerico
9d67a905b7
revert addition of --skip-soong-test flag
...
aosp/2045666 attempted to permit passing the `--skip-soong-tests` flag
through the `b` command to `soong_ui`, but it has been causing problems.
Test: b build '...' --skip-soong-tests is not recognized
Test: build/bazel/ci/bp2build.sh
Change-Id: I02487841d8081218dc941cb04bfa1a9e148ab6af
2022-04-11 12:27:10 +00:00
Treehugger Robot
b233bcfe39
Merge "Implement multitree lunch" am: 9d1b28ed10
am: 1080b9f3f6
am: 9ebe2e2729
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2060107
Change-Id: Iec70a4739c1b93050b3d4827b409c554da0dd2d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-09 03:13:22 +00:00
Treehugger Robot
9ebe2e2729
Merge "Implement multitree lunch" am: 9d1b28ed10
am: 1080b9f3f6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2060107
Change-Id: If678089fe04ad01c550b3311f0f922fd14f67ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-09 02:47:35 +00:00
Treehugger Robot
1080b9f3f6
Merge "Implement multitree lunch" am: 9d1b28ed10
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2060107
Change-Id: I8f1f7fc98a0e521a9e3347d1b140eefa657857a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-09 00:41:56 +00:00
Treehugger Robot
9d1b28ed10
Merge "Implement multitree lunch"
2022-04-09 00:19:03 +00:00
Treehugger Robot
8a3608e5f4
Merge "change logtags dependency to provide java sources" am: 84a39ac3f0
am: 1b14ac6ba6
am: 2f101fbc2b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2045664
Change-Id: Icdd5a31eefe6c09c29fbddc6d07efcf610dc673e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 23:49:42 +00:00
Treehugger Robot
2f101fbc2b
Merge "change logtags dependency to provide java sources" am: 84a39ac3f0
am: 1b14ac6ba6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2045664
Change-Id: I227d5cee29772f57ad84e513c74ea78bf25726ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 23:27:24 +00:00
Treehugger Robot
1b14ac6ba6
Merge "change logtags dependency to provide java sources" am: 84a39ac3f0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2045664
Change-Id: I375f1deeb6430e0b3ec5a3df7f5d54b739e25528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:58:07 +00:00
Treehugger Robot
84a39ac3f0
Merge "change logtags dependency to provide java sources"
2022-04-08 22:37:22 +00:00
Cole Faust
69cb5fb275
Merge "Fix "posix_spawn: Argument list too long" issue" am: ea935b5ad9
am: dac2c71fbd
am: 1b12b21993
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2056514
Change-Id: I247b85108b0530e4af41f8f23042f4b0e97bbed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 21:43:00 +00:00
Cole Faust
1b12b21993
Merge "Fix "posix_spawn: Argument list too long" issue" am: ea935b5ad9
am: dac2c71fbd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2056514
Change-Id: I928168c13ecadab5df690a2b26acb8fb27d86776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 21:22:45 +00:00
Cole Faust
dac2c71fbd
Merge "Fix "posix_spawn: Argument list too long" issue" am: ea935b5ad9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2056514
Change-Id: I9c5f05d53de58a7c561f312cd51ebca3d32ebee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 21:04:09 +00:00
Cole Faust
ea935b5ad9
Merge "Fix "posix_spawn: Argument list too long" issue"
2022-04-08 20:44:38 +00:00
Joe Onorato
824608c33d
Implement multitree lunch
...
Test: (cd build/make/orchestrator/core ; ./test_lunch.py)
Change-Id: I4ba36a79abd13c42b986e3ba0d6d599c1cc73cb0
2022-04-08 13:42:55 -07:00
Bill Yi
a0be287620
[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: bd6df21f31
-s ours am: ef46aa1f16
-s ours am: 66a20a72ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/2058834
Change-Id: I64eed29aca86968e05f479461dfb2513222fc440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:46:44 +00:00