StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,306 Commits 1 Branch 0 Tags
e80e8b4c5cbde72338ee6e88d3b51a5f36656be2
Commit Graph

87306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
e876500b08 Merge changes from topic "am-5a6f444331ae472aaeb494acba3b9515" into udc-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: f96858a818 -s ours
  [automerger skipped] Some changes to support SBOM generation for b build unbundled APEXs. am: 233d5b97f8 -s ours
 2023-05-19 22:22:42 +00:00
Wei Li
377f88a664 [automerger skipped] Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: f96858a818 -s ours 
am skip reason: Merged-In I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f with SHA-1 fd7e6517d3 is already in history

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

Change-Id: I7a73467e1759eed80afa8a98e3758f74dbf88d65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 22:22:26 +00:00
Wei Li
ed7a919561 [automerger skipped] Some changes to support SBOM generation for b build unbundled APEXs. am: 233d5b97f8 -s ours 
am skip reason: Merged-In I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f with SHA-1 fd7e6517d3 is already in history

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

Change-Id: Iff228b62a1dd879e73242ff3a1df7aa1240f2762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 22:22:25 +00:00
Kelvin Zhang
3e067dc7b8 Merge "Revert "16k: Add 16K variant kernel/ramdisk build targets"" am: 863cba2c1d am: f6da3925e4 am: 16edf2b59f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2598005

Change-Id: Id4ec6176a3a714878dce5fa8bf055e602bca8af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 22:22:22 +00:00
Wei Li
f96858a818 Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev 
* changes:
  Some changes to support SBOM generation for b build unbundled APEXs.
  Export some make variables to soong.variables.
 2023-05-19 21:37:23 +00:00
Kelvin Zhang
16edf2b59f Merge "Revert "16k: Add 16K variant kernel/ramdisk build targets"" am: 863cba2c1d am: f6da3925e4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2598005

Change-Id: I8df285bdd028de1448d0b9b702d2eb7c4755f0ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 21:35:27 +00:00
Kelvin Zhang
decee4adb7 Add 16K artifacts to PREBUILT_IMAGES/ dir of target_files 
Test: th
Bug: 283506035
Change-Id: I9be3982b5a4324ec839937d10c33266c7d27c525
 2023-05-19 14:31:00 -07:00
Matthew Sedam
fb861d6ba6 Fix small spelling error in build/core/main.mk 
Bug: N/A
Change-Id: I858fb4b23a1c85035c59c42d8e3260fd376f941c
Test: N/A
 2023-05-19 20:58:16 +00:00
Kelvin Zhang
f6da3925e4 Merge "Revert "16k: Add 16K variant kernel/ramdisk build targets"" am: 863cba2c1d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2598005

Change-Id: I0ed2a96b9ebffbed69908072ec852b0865513a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 20:51:23 +00:00
Kelvin Zhang
d8eac1cb9a 16k: Add 16K variant kernel/ramdisk build targets 
This adds two new build variables, BOARD_KERNEL_PATH_16K and
BOARD_KERNEL_MODULES_16K . BOARD_KERNEL_PATH_16K will be copied
to output directory as is.

BOARD_KERNEL_MODULES_16K is a list of modules which will be packed into a
ramdisk and added to output dir. This allows cuttlefish to switch to 16K
kernel at runtime without adding too much overhead, as ramdisk building
takes very little time.

Bug: 253827893
Test: m kernel_16k ramdisk_16k

Change-Id: Ibb36ba4c3399b3f193795aea6597a4aa535f1bec
 2023-05-19 13:08:52 -07:00
Kelvin Zhang
863cba2c1d Merge "Revert "16k: Add 16K variant kernel/ramdisk build targets"" 2023-05-19 20:05:00 +00:00
Kelvin Zhang
6572bee96b Revert "16k: Add 16K variant kernel/ramdisk build targets" 
This reverts commit 1f04dfaba2.

Reason for revert: breaks build on ab/10170403

Change-Id: I92e064ab07b02e4f17a22b113032eaa4d9f131cc
 2023-05-19 20:03:19 +00:00
Joe Onorato
7b578d32f9 Revert "Define release flags in starlark instead of make" 
This reverts commit c113a70221.

Doesn't work with OUT_DIR hard coded outside the tree.

Test: OUT_DIR=/source/whatever m
Bug: 283278495
Change-Id: I8cc74a9ec936b9c7502b97b9b7a4fd731988c407
 2023-05-19 09:22:42 -07:00
Yihan Dong
58c428e336 Remove GTS-Verifier license check 
The whole GTS-Verifier will be removed. Before that, remove GTS-V
license check first.

Ignore-AOSP-First: This CL must be submit with other CLs in the topic to avoid breaking the test. This CL will be cherry pick to AOSP after submitting.

Bug: 283384166
Test: m gts
Change-Id: I5bc8c1f4609f55cedd5bfbed014b65de164e2b16
 2023-05-19 10:38:55 +00:00
Steve Berbary
e5e0493b28 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours am: 7080fa2583 -s ours am: 240278dfc7 -s ours am: 9dd5ec96cf -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: Ifda236be6c407c720269a502b2342e8464440a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 02:09:07 +00:00
Kelvin Zhang
704946ce3b Merge "16k: Add 16K variant kernel/ramdisk build targets" am: ab9fb56784 am: 19020dc0ef am: b8c7fe4cea 
Original change: https://android-review.googlesource.com/c/platform/build/+/2593545

Change-Id: I9e2652d58f7d7087bc8ef72d9738bf814f7970dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 02:07:52 +00:00
Steve Berbary
ce2a5ba050 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours am: 7080fa2583 -s ours am: 240278dfc7 -s ours am: 98b4c2d908 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: I8fa4c9f537c7f7fb48e5955337acbed9ead00747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 01:24:51 +00:00
Steve Berbary
198dc77008 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours am: 6430535916 -s ours am: 1a0f37dfe6 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: I24f4d4d2177a1fc588c6f0cc3a3ac4ca8ba88bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 01:24:31 +00:00
Steve Berbary
9dd5ec96cf [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours am: 7080fa2583 -s ours am: 240278dfc7 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: Ibd97260dfa03d16597cc7d1549bb50d728f20d5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 01:23:58 +00:00
Kelvin Zhang
b8c7fe4cea Merge "16k: Add 16K variant kernel/ramdisk build targets" am: ab9fb56784 am: 19020dc0ef 
Original change: https://android-review.googlesource.com/c/platform/build/+/2593545

Change-Id: Ic9244204a878341bb8652f7a11c9277d6a285c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 01:23:30 +00:00
Steve Berbary
98b4c2d908 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours am: 7080fa2583 -s ours am: 240278dfc7 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: I32880c20bd48be3cc4afda27cc61845756b0b124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 01:23:23 +00:00
Steve Berbary
240278dfc7 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours am: 7080fa2583 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: Id8624de6bed7e22cb79c8ae6dd4dec1a2ff6ad41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 00:43:43 +00:00
Kelvin Zhang
19020dc0ef Merge "16k: Add 16K variant kernel/ramdisk build targets" am: ab9fb56784 
Original change: https://android-review.googlesource.com/c/platform/build/+/2593545

Change-Id: I4dd6845d8c3a193b23ff74d51418b910cefc9cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 00:41:37 +00:00
Steve Berbary
1a0f37dfe6 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours am: 6430535916 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: I7d4e0ba80a5d153eecc19b72a5b0b7d2fa96973b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 00:40:21 +00:00
Wei Li
233d5b97f8 Some changes to support SBOM generation for b build unbundled APEXs. 
1) Use output file path of installed files in build system since there is no PRODUCT_OUT in Bazel
2) Use CONTAINS to describe the relationship between a APEX and files it contains
3) Generate SBOM of APEXs, which is similar to SBOM of products

Bug: 275472038
Test: CIs
(cherry picked from https://android-review.googlesource.com/q/commit:fd7e6517d345d3b8d4af12dae345434d968b83b9)
Merged-In: I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f
Change-Id: I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f
 2023-05-19 00:35:20 +00:00
Wei Li
d637b06d8f Export some make variables to soong.variables. 
Bug: 275472038
Test: CIs
(cherry picked from https://android-review.googlesource.com/q/commit:996830047f79a5b9e9c9ed590886217068d9576e)
Merged-In: I2e7a07007224364418659453d979e2bee58fe5f9
Change-Id: I2e7a07007224364418659453d979e2bee58fe5f9
 2023-05-19 00:35:09 +00:00
Steve Berbary
7080fa2583 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: Ieede0d4113acbd045f30ea5c01fe5f474138757c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 00:01:23 +00:00
Steve Berbary
6430535916 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: I40312afeee86a16cb348324782fa127bce50ddba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 00:00:49 +00:00
Kelvin Zhang
ab9fb56784 Merge "16k: Add 16K variant kernel/ramdisk build targets" 2023-05-19 00:00:32 +00:00
Steve Berbary
fb5d27605d [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: I9ac86a0d9040902c0e40000d1ffca13fb11c098a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 23:11:43 +00:00
Steve Berbary
8dc00cfae4 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: I1d7b980ff3cb3b6a36dc2079bdca6ff60ce8c89a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 22:29:41 +00:00
Dan Albert
dbe684da9d Merge "Adapt to gdbrunner packaging." am: d230125270 am: ce7c1016c5 am: ff66bb231c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2592985

Change-Id: I17b242bb6126613e30b6a64d09676816dfa2eaf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 21:39:01 +00:00
Steve Berbary
666a64473b Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: I1f63d2d560b51bfec718dbef8b302b1af0c811c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 21:37:43 +00:00
Dan Albert
ff66bb231c Merge "Adapt to gdbrunner packaging." am: d230125270 am: ce7c1016c5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2592985

Change-Id: Ib0dc86222dea150fff0b21c900750e2b7bab5bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 20:49:18 +00:00
Steve Berbary
b0733d4f1e Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: I792f648ace840368e43c197b6fbb99f745bd03c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 20:48:39 +00:00
Daniel Zheng
14d374b540 [automerger skipped] Merge "Add --max_threads to OTA generation" into udc-dev am: b87d46cb1a -s ours 
am skip reason: Merged-In I9bae92ee43c21926434ab04563a2b4f0678b73eb with SHA-1 a30989bafa is already in history

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

Change-Id: I8e3fa7292360af86cf9f3bb80f759ead52d89e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 20:24:59 +00:00
Daniel Zheng
dc1ccea49b [automerger skipped] Add --max_threads to OTA generation am: 0d3c15c2ae -s ours 
am skip reason: Merged-In I9bae92ee43c21926434ab04563a2b4f0678b73eb with SHA-1 a30989bafa is already in history

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

Change-Id: Ibabed5e9f40c27a8f87de81e036d24b33184f604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 20:24:57 +00:00
Kelvin Zhang
1f04dfaba2 16k: Add 16K variant kernel/ramdisk build targets 
This adds two new build variables, BOARD_KERNEL_PATH_16K and
BOARD_KERNEL_MODULES_16K . BOARD_KERNEL_PATH_16K will be copied
to output directory as is.

BOARD_KERNEL_MODULES_16K is a list of modules which will be packed into a
ramdisk and added to output dir. This allows cuttlefish to switch to 16K
kernel at runtime without adding too much overhead, as ramdisk building
takes very little time.

Bug: 253827893
Test: m kernel_16k ramdisk_16k
Change-Id: I4e49c727e5ed07a915145897cb987f29b0fe68e2
 2023-05-18 20:12:09 +00:00
Dan Albert
ce7c1016c5 Merge "Adapt to gdbrunner packaging." am: d230125270 
Original change: https://android-review.googlesource.com/c/platform/build/+/2592985

Change-Id: Ief01ae7d4cc5f62aa23f1a7aface65021073c507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 20:03:36 +00:00
Steve Berbary
71dbb01307 Update Security String to 2023-07-01 am: 053ad8aa1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: Ic8b2f08177994f51fcc35f13eeb5b2280824fccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 19:59:13 +00:00
Daniel Zheng
b87d46cb1a Merge "Add --max_threads to OTA generation" into udc-dev 2023-05-18 19:53:12 +00:00
Dan Albert
d230125270 Merge "Adapt to gdbrunner packaging." 2023-05-18 18:43:22 +00:00
Liz Kammer
bc4f48c415 Add BUILD_BROKEN_PLUGIN_VALIDATION flag 
Use is to specify the list of plugins are are not allowed.

Ignore-AOSP-First: Requires an internal only change to not break when submitted
Test: CI
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f24be9dba9b53b0c1682929253a3eba9af7a4c31)
Merged-In: Ia2fe83d82ead618e480e99a82b1b825ed08d3eab
Change-Id: Ia2fe83d82ead618e480e99a82b1b825ed08d3eab
 2023-05-18 18:20:22 +00:00
Steve Berbary
178253992b [automerger skipped] Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1 am: 470e269362 -s ours am: 7fea641ca0 -s ours am: 7fb5ef6926 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 d6c119bfaa is already in history

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

Change-Id: Iba4deef3ae8c519ef0a545e245a350176196049b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 12:58:47 +00:00
Steve Berbary
7fb5ef6926 [automerger skipped] Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1 am: 470e269362 -s ours am: 7fea641ca0 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 d6c119bfaa is already in history

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

Change-Id: I616b4552ac3a2e7be8be6e96ee8f78d1fbee5e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 11:14:28 +00:00
Steve Berbary
766198ba92 [automerger skipped] Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1 am: 470e269362 -s ours am: 7fea641ca0 -s ours am: efe25f78b4 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 d6c119bfaa is already in history

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

Change-Id: Ibf23427dc9b371087ae16a36d04566f6f560748a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 11:14:28 +00:00
Steve Berbary
5d09fb1acd [automerger skipped] Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1 am: 70c7201473 -s ours am: 0879ff455e -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 d6c119bfaa is already in history

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

Change-Id: Ic4bb9f3406a909c8a45093bf8a00a3d28379e12a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 11:14:14 +00:00
Steve Berbary
efe25f78b4 [automerger skipped] Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1 am: 470e269362 -s ours am: 7fea641ca0 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 d6c119bfaa is already in history

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

Change-Id: Ibc72010566b93bff8a811ae3d35144ec1f83ace7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 11:13:32 +00:00
Steve Berbary
7fea641ca0 [automerger skipped] Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1 am: 470e269362 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 d6c119bfaa is already in history

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

Change-Id: Iafa4a25f60ce6f2fa6e4fee715fe6c0954afbcbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 10:34:14 +00:00
Steve Berbary
0879ff455e [automerger skipped] Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1 am: 70c7201473 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 d6c119bfaa is already in history

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

Change-Id: Ic34732b1b6005a1811dc3c0236488346e90d4320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 10:31:05 +00:00