StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,773 Commits 1 Branch 0 Tags
8071667cb40442f6dd3d2dba1ff9ed4843ec4b8c
Commit Graph

82773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
1eb2dc871c Merge "skip soong tests by default for b command" 2022-08-30 00:24:07 +00:00
Treehugger Robot
8bc1c2a558 Merge "Allow to force ro.audio.silent=1 in build." am: 00b4775107 
Original change: https://android-review.googlesource.com/c/platform/build/+/2197757

Change-Id: I79fb38ebc5681bec5f2bb4852fd0ce7b511260d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 00:10:32 +00:00
Treehugger Robot
00b4775107 Merge "Allow to force ro.audio.silent=1 in build." 2022-08-29 23:38:07 +00:00
Florian Mayer
1264fcc95a [make] Add memtag-stack sanitizer, switch to linker-generated notes. 
This change depends on the following toolchain commit:
https://reviews.llvm.org/D118948

Bug: b/174878242

Change-Id: Id67503a5c0983c9ae6fc29f158f4d20bca778e9f
 2022-08-29 15:18:05 -07:00
Cole Faust
d5143ca39a Fix incorrect function call in product-graph 
This was accidentally broken in aosp/2064287

Fixes: 230599451
Test: m product-graph
Change-Id: Ibc9aabc5ddf7ad4d347e89019be44ef0c8ae0ff7
 2022-08-29 17:22:50 +02:00
Florian Mayer
fd1187e821 Allow to force ro.audio.silent=1 in build. 
Change-Id: I3e0775dc0befb09d47525284351dad099090b96b
 2022-08-26 21:52:57 +00:00
Alix
7a4d539e75 Default BuildBrokenClangProperty to empty (false) 
Clang property is deprecated. Set up a BUILD_BROKEN_CLANG_PROPERTY
flag so partners can bypass errors from using clang.

Change-Id: I7ec19c3d11086046031108ecccba5065c38fa338
Test: m nothing & Treehugger
 2022-08-26 20:05:42 +00:00
Treehugger Robot
1e973ad976 Merge "Add mtectrl to the base image." am: a52c09d238 am: 8c87cf8f77 am: cb62ae369b am: 9165181554 am: c41a9540cb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2197576

Change-Id: If6b3794cf272bc3666ba4515121d35c738dd0e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 12:39:53 +00:00
Treehugger Robot
c41a9540cb Merge "Add mtectrl to the base image." am: a52c09d238 am: 8c87cf8f77 am: cb62ae369b am: 9165181554 
Original change: https://android-review.googlesource.com/c/platform/build/+/2197576

Change-Id: I02b4e6283add1605a2d52179235c5661ffa43751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 12:12:19 +00:00
Treehugger Robot
9165181554 Merge "Add mtectrl to the base image." am: a52c09d238 am: 8c87cf8f77 am: cb62ae369b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2197576

Change-Id: Ie96ec16c91cc01a6f1d6d03d1e34999c97dd23e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 11:55:08 +00:00
Treehugger Robot
cb62ae369b Merge "Add mtectrl to the base image." am: a52c09d238 am: 8c87cf8f77 
Original change: https://android-review.googlesource.com/c/platform/build/+/2197576

Change-Id: I2429f67e9a7656964dff410f44d5c6395bb2ac63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 11:28:05 +00:00
Treehugger Robot
8c87cf8f77 Merge "Add mtectrl to the base image." am: a52c09d238 
Original change: https://android-review.googlesource.com/c/platform/build/+/2197576

Change-Id: I5a02fe98646680f804f6e52bea2ee3d7b38a2d6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 11:08:44 +00:00
Treehugger Robot
a52c09d238 Merge "Add mtectrl to the base image." 2022-08-26 10:49:29 +00:00
Evgenii Stepanov
49fd191501 Add mtectrl to the base image. 
This is a tiny utility (11Kb) that implements the bootloader switch
interface for MTE:
https://source.android.com/docs/security/memory-safety/bootloader-support

It is only useful on armv8.5+ devices, but there is no separate GSI
image for those.

Bug: 242244112
Test: ls /system/bin/mtectrl
Change-Id: I2696a76d5828007a2db486f41064bcfc0e89ec36
 2022-08-25 16:20:34 -07:00
Yifan Hong
2e1a7e111d Merge "Set default recovery USB vendor/product IDs." am: 9d4741cefb am: e72817456b am: e766ed31df am: 7322ef72f5 am: d162092f4e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2186500

Change-Id: I5c749aca8e46d24a08f3d064547301d01a09106a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 20:33:24 +00:00
Yifan Hong
d162092f4e Merge "Set default recovery USB vendor/product IDs." am: 9d4741cefb am: e72817456b am: e766ed31df am: 7322ef72f5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2186500

Change-Id: I8e87972003beb249c92898307eabae0d130849b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 20:02:56 +00:00
Yifan Hong
7322ef72f5 Merge "Set default recovery USB vendor/product IDs." am: 9d4741cefb am: e72817456b am: e766ed31df 
Original change: https://android-review.googlesource.com/c/platform/build/+/2186500

Change-Id: I996d4e15fdf0360e0463859b70cad54312017679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 19:44:08 +00:00
Yifan Hong
e766ed31df Merge "Set default recovery USB vendor/product IDs." am: 9d4741cefb am: e72817456b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2186500

Change-Id: I9ef90de6d2b60a917641a80b14d88c82a65b2878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 19:23:20 +00:00
Yifan Hong
e72817456b Merge "Set default recovery USB vendor/product IDs." am: 9d4741cefb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2186500

Change-Id: I5b449108a4d79e4b28334338d7b0351c746237af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 18:36:17 +00:00
Sam Delmerico
56e576dc12 skip soong tests by default for b command 
It doesn't really make sense to incur the cost of running Soong tests to
Bazel users. We can shave off 20 seconds from the local critical path
during clean builds (or if Soong itself has changed) by enabling
--skip-soong-tests in the b command.

Test: b build '...'
Test: b build '...' --run-soong-tests
Bug: 240231596
Change-Id: I77d652502dc000908166e13045aa3e245c2e762c
 2022-08-25 14:13:21 -04:00
Yifan Hong
9d4741cefb Merge "Set default recovery USB vendor/product IDs." 2022-08-25 18:08:14 +00:00
Melisa Carranza Zúñiga
4f54249d53 Merge "Adding output_path arg to sign_sepolicy_path call" am: 6c4e194cff am: 12355027d4 am: 52bcca3bd7 am: 45ded6087e am: ff03405889 
Original change: https://android-review.googlesource.com/c/platform/build/+/2193595

Change-Id: Iecb873582bff7c99907c7c41725b2695ee4e4272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 10:47:39 +00:00
Melisa Carranza Zúñiga
ff03405889 Merge "Adding output_path arg to sign_sepolicy_path call" am: 6c4e194cff am: 12355027d4 am: 52bcca3bd7 am: 45ded6087e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2193595

Change-Id: I2999a35aabe1bba3788c89339e1df2dbcfa5d4a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 10:29:36 +00:00
Melisa Carranza Zúñiga
45ded6087e Merge "Adding output_path arg to sign_sepolicy_path call" am: 6c4e194cff am: 12355027d4 am: 52bcca3bd7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2193595

Change-Id: I3a6f826f6fa3fa6e29b05aa4e1d3634c5467e8cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 10:04:09 +00:00
Melisa Carranza Zúñiga
52bcca3bd7 Merge "Adding output_path arg to sign_sepolicy_path call" am: 6c4e194cff am: 12355027d4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2193595

Change-Id: I76f747193d1b284e5b7f561ad8b55a186aa3cb5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 09:24:46 +00:00
Melisa Carranza Zúñiga
12355027d4 Merge "Adding output_path arg to sign_sepolicy_path call" am: 6c4e194cff 
Original change: https://android-review.googlesource.com/c/platform/build/+/2193595

Change-Id: I8a9f49dd14598c3968c9adb01b5ead0477f8bb19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 08:56:38 +00:00
Melisa Carranza Zúñiga
6c4e194cff Merge "Adding output_path arg to sign_sepolicy_path call" 2022-08-25 08:25:33 +00:00
Treehugger Robot
d24254bcd9 Merge "GSI: add VNDK 33/remove VNDK 28" am: 464ed2fda1 am: a45dd66042 am: 3416611526 am: ec98964749 am: f7c4206eb4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2194963

Change-Id: Ic8fa3c648a83403fbc8362388a1dd50628c4b5e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 06:11:24 +00:00
Treehugger Robot
f7c4206eb4 Merge "GSI: add VNDK 33/remove VNDK 28" am: 464ed2fda1 am: a45dd66042 am: 3416611526 am: ec98964749 
Original change: https://android-review.googlesource.com/c/platform/build/+/2194963

Change-Id: I6edc9f31ab5cb0b272f75affd011f8c414bf3b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 05:40:55 +00:00
Treehugger Robot
ec98964749 Merge "GSI: add VNDK 33/remove VNDK 28" am: 464ed2fda1 am: a45dd66042 am: 3416611526 
Original change: https://android-review.googlesource.com/c/platform/build/+/2194963

Change-Id: Ia2f5136959a59c878b70f9c4d88158e8252cb3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 04:30:41 +00:00
Treehugger Robot
3416611526 Merge "GSI: add VNDK 33/remove VNDK 28" am: 464ed2fda1 am: a45dd66042 
Original change: https://android-review.googlesource.com/c/platform/build/+/2194963

Change-Id: Id52d9035b87d846c39b4288cb289e5ebad20d1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 03:57:40 +00:00
Treehugger Robot
a45dd66042 Merge "GSI: add VNDK 33/remove VNDK 28" am: 464ed2fda1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2194963

Change-Id: I0a7496da20629eb13d1e486584f38a7192acfeb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-25 03:38:32 +00:00
hungweichen
cc9c05d5b8 Remove HashTreeInfo from verity_utils.py 
We are removing VB related functionalities from release tools. This
change removes the hashtreeinfo and generator in verity_utils.py. It
also clears the function args using it.

Bug: 241044073
Test: atest under build/make
Change-Id: Icc298256be6917ffbd40cf4735f8e8092b541c9f
 2022-08-25 03:30:06 +00:00
Treehugger Robot
464ed2fda1 Merge "GSI: add VNDK 33/remove VNDK 28" 2022-08-25 03:03:21 +00:00
Hung-ying Tyan
bdce249c63 GSI: add VNDK 33/remove VNDK 28 
Bug: 243530456
Test: mix GSI on Android 13 Cuttlefish
Change-Id: I7af784ac6fda2015fa7e9da8cf552755fd74d2e7
 2022-08-25 08:11:42 +08:00
Steve Berbary
b10ec94782 [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 60c056572f -s ours am: c30ac436a8 -s ours am: 0f5541b8a7 -s ours am: 5a05bcb8e3 -s ours am: ba0ef441e7 -s ours am: 6b10c3d879 -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: Icc08350dfc8bc9cd841acfca20a395c761d40cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 23:21:44 +00:00
Steve Berbary
99aa664e93 [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 60c056572f -s ours am: c30ac436a8 -s ours am: 0f5541b8a7 -s ours am: 0691df93d5 -s ours am: 9153eb13fb -s ours am: 081f85922b -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: I59f253ff024dcfa14d4bbbddf1ab1b5fa6124cbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 23:21:34 +00:00
Steve Berbary
a493d91cb6 [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 23a5a0966d -s ours am: 06d2805948 -s ours am: 9fdd1d2899 -s ours am: dc4f7d7fad -s ours am: 13c0a4beca -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: I784f25f8fb754632efa430bb2bd93442ea17895a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 23:21:22 +00:00
Steve Berbary
460b2c7264 [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 23a5a0966d -s ours am: 06d2805948 -s ours am: 2c6268efce -s ours am: 22fa529044 -s ours am: 566f12a0f0 -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: Idc1a25dc932b0dfb22fd9239041ff076aeab8800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 23:21:02 +00:00
Steve Berbary
41f21fc514 [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 60c056572f -s ours am: c30ac436a8 -s ours am: 0f5541b8a7 -s ours am: 0691df93d5 -s ours am: 1e6dd6b869 -s ours am: 2590d5b705 -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: I023a2c067b8fdf2a446131afea9854af93a96c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 23:20:52 +00:00
Steve Berbary
71553a498f [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 23a5a0966d -s ours am: 06d2805948 -s ours am: 2c6268efce -s ours am: 24e9f308ed -s ours am: e55f1beaa4 -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: I76b3294bf6783b3f19a8cdd96f79ca570e47e74d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 23:20:40 +00:00
Steve Berbary
6b10c3d879 [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 60c056572f -s ours am: c30ac436a8 -s ours am: 0f5541b8a7 -s ours am: 5a05bcb8e3 -s ours am: ba0ef441e7 -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: I28d0abac8154c869b0b91bc26eb67905ee27d1b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 23:15:46 +00:00
Steve Berbary
081f85922b [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 60c056572f -s ours am: c30ac436a8 -s ours am: 0f5541b8a7 -s ours am: 0691df93d5 -s ours am: 9153eb13fb -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: Iae7b2c9e22995489bbf893bff447f517f2875e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 23:15:38 +00:00
Steve Berbary
13c0a4beca [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 23a5a0966d -s ours am: 06d2805948 -s ours am: 9fdd1d2899 -s ours am: dc4f7d7fad -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: Ie5062abdd3b822c299b2923ee1ea0fe578f91c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 23:15:28 +00:00
Steve Berbary
566f12a0f0 [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 23a5a0966d -s ours am: 06d2805948 -s ours am: 2c6268efce -s ours am: 22fa529044 -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: I789c9bbc947fab23ba8f3742184a8575e2d7042d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 23:05:49 +00:00
Steve Berbary
2590d5b705 [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 60c056572f -s ours am: c30ac436a8 -s ours am: 0f5541b8a7 -s ours am: 0691df93d5 -s ours am: 1e6dd6b869 -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: Iad66bcf512ed53b835da11e71b22bee248709072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 22:59:35 +00:00
Steve Berbary
ba0ef441e7 [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 60c056572f -s ours am: c30ac436a8 -s ours am: 0f5541b8a7 -s ours am: 5a05bcb8e3 -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: I7b0dea310a7e0f3e492f029d55d6dfd501c0d65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 22:57:15 +00:00
Steve Berbary
9153eb13fb [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 60c056572f -s ours am: c30ac436a8 -s ours am: 0f5541b8a7 -s ours am: 0691df93d5 -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: I21467ea6879bcd7f729aa1acf6938fff6d73e799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 22:57:12 +00:00
Steve Berbary
1e6dd6b869 [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 60c056572f -s ours am: c30ac436a8 -s ours am: 0f5541b8a7 -s ours am: 0691df93d5 -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: I0e8362c18facfd82618a1d1d08c6d3b9a349dad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 22:57:10 +00:00
Steve Berbary
64a34f937a [automerger skipped] Update Security String to 2022-10-01 am: 87cae0791c am: 67ceff8c05 am: fc69bdad9c am: e47eaa0ea6 am: 9a6781a31d am: 60c056572f -s ours am: c30ac436a8 -s ours am: 0f5541b8a7 -s ours am: 79f29a076e -s ours 
am skip reason: Merged-In If4e16c8a7ab84076c129e1a6ed1e7c31b46164db with SHA-1 2e04ab82f0 is already in history

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

Change-Id: Ib93674fd5e6d3fb4177177dc1f60ff39f0f8915d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 22:56:53 +00:00