StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,310 Commits 1 Branch 0 Tags
858e08e0cad9d9bb3655567f3d1e8f596fa3995e
Commit Graph

84310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
858e08e0ca Merge "Fix s to t OTA" am: 64bfc41359 am: c4e1d12853 
Original change: https://android-review.googlesource.com/c/platform/build/+/2531966

Change-Id: Ia20bdef8a788e1a4fbb8facf047c2bf211bd8495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 01:46:13 +00:00
Treehugger Robot
c4e1d12853 Merge "Fix s to t OTA" am: 64bfc41359 
Original change: https://android-review.googlesource.com/c/platform/build/+/2531966

Change-Id: Ie38f034e6ced581e75df4069cc209801a987dd51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 01:25:50 +00:00
Treehugger Robot
64bfc41359 Merge "Fix s to t OTA" 2023-04-13 01:01:57 +00:00
Treehugger Robot
8bf7d62a34 Merge "Remove emulator dependencies on non emulator targets (1)" am: 2782b82d01 am: 825ec3ea87 
Original change: https://android-review.googlesource.com/c/platform/build/+/2513876

Change-Id: I0e856b35ccaa0f175e3990ca28309fe97947b8a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:27:56 +00:00
Treehugger Robot
3f9a048876 [automerger skipped] Merge "Merge TQ2A.230405.003" am: 09ead5b787 am: 91b6a0ca43 -s ours 
am skip reason: skipped by user delphij

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

Change-Id: I81bd617605ac3918b2c0a55ee18850ce7587ed76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:22:55 +00:00
Steve Berbary
e163a53b87 [automerger skipped] Update Security String to 2023-06-01 am: 333b59fd7f am: f016d3587c am: 99b46a3371 am: 02f67f19fb -s ours am: 72b606f500 -s ours am: 0765119171 -s ours am: f1c360c071 -s ours am: 968189a216 -s ours 
am skip reason: Merged-In I4b2ea3956c34aa56cc6f54bab7148f116c34759e with SHA-1 8c6ca0a1e6 is already in history

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

Change-Id: I9faa418688871309e40e6f6409825c4f8958b2c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:16:48 +00:00
Steve Berbary
968189a216 [automerger skipped] Update Security String to 2023-06-01 am: 333b59fd7f am: f016d3587c am: 99b46a3371 am: 02f67f19fb -s ours am: 72b606f500 -s ours am: 0765119171 -s ours am: f1c360c071 -s ours 
am skip reason: Merged-In I4b2ea3956c34aa56cc6f54bab7148f116c34759e with SHA-1 8c6ca0a1e6 is already in history

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

Change-Id: Ib46911f05367a2521d2ff72e17eb54cbb23e2b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:47:16 +00:00
Treehugger Robot
825ec3ea87 Merge "Remove emulator dependencies on non emulator targets (1)" am: 2782b82d01 
Original change: https://android-review.googlesource.com/c/platform/build/+/2513876

Change-Id: I6f666d0658e1fd5d950242cf0716c766ffd61878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:04:50 +00:00
Steve Berbary
f1c360c071 [automerger skipped] Update Security String to 2023-06-01 am: 333b59fd7f am: f016d3587c am: 99b46a3371 am: 02f67f19fb -s ours am: 72b606f500 -s ours am: 0765119171 -s ours 
am skip reason: Merged-In I4b2ea3956c34aa56cc6f54bab7148f116c34759e with SHA-1 8c6ca0a1e6 is already in history

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

Change-Id: Ie37f772d79cc6bfc08e97c080f71da20293b6ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:03:41 +00:00
Treehugger Robot
91b6a0ca43 Merge "Merge TQ2A.230405.003" am: 09ead5b787 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529415

Change-Id: I6da28784cb149e4d28b5c846cf75fa003614d8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:00:55 +00:00
Steve Berbary
0765119171 [automerger skipped] Update Security String to 2023-06-01 am: 333b59fd7f am: f016d3587c am: 99b46a3371 am: 02f67f19fb -s ours am: 72b606f500 -s ours 
am skip reason: Merged-In I4b2ea3956c34aa56cc6f54bab7148f116c34759e with SHA-1 8c6ca0a1e6 is already in history

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

Change-Id: I3caa288fa0ef58f145893cc76f3be9d681f7b3cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 18:28:42 +00:00
Treehugger Robot
2782b82d01 Merge "Remove emulator dependencies on non emulator targets (1)" 2023-04-12 18:13:04 +00:00
Steve Berbary
72b606f500 [automerger skipped] Update Security String to 2023-06-01 am: 333b59fd7f am: f016d3587c am: 99b46a3371 am: 02f67f19fb -s ours 
am skip reason: Merged-In I4b2ea3956c34aa56cc6f54bab7148f116c34759e with SHA-1 8c6ca0a1e6 is already in history

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

Change-Id: I5c3f41c5f3a17e6d6e0d2b2492d6f7d2cdfc7e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 17:59:10 +00:00
Steve Berbary
02f67f19fb Update Security String to 2023-06-01 am: 333b59fd7f am: f016d3587c am: 99b46a3371 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22555018

Change-Id: I9513c514cd5994f836a4dd45236d319f4fd56ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 17:28:19 +00:00
Treehugger Robot
09ead5b787 Merge "Merge TQ2A.230405.003" 2023-04-12 17:22:26 +00:00
Steve Berbary
99b46a3371 Update Security String to 2023-06-01 am: 333b59fd7f am: f016d3587c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22555018

Change-Id: Ia819a76220740ffb5975450804bf0ec881d6b568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 16:57:15 +00:00
Kelvin Zhang
6c5f1c32a3 Merge "Fix releasetools timeouts" am: 010bbea401 am: d434bd4c02 
Original change: https://android-review.googlesource.com/c/platform/build/+/2530977

Change-Id: I6c8c2360e17434139d2f0beffe5c0af807e9595d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 16:39:03 +00:00
Steve Berbary
f016d3587c Update Security String to 2023-06-01 am: 333b59fd7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22555018

Change-Id: I6ea766603e2832124510125f47f86ffd0e6a3978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 16:24:59 +00:00
Kelvin Zhang
d434bd4c02 Merge "Fix releasetools timeouts" am: 010bbea401 
Original change: https://android-review.googlesource.com/c/platform/build/+/2530977

Change-Id: I6825928c6bf5d33840544f8a5ea0dacb95fbfc32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 16:10:06 +00:00
Kelvin Zhang
010bbea401 Merge "Fix releasetools timeouts" 2023-04-12 15:37:59 +00:00
Wei Li
82bf15a96d Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist".""" am: 2e8993e882 am: e7937f2c3b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525828

Change-Id: I4628607b633cc2d485bdb6ac29c8396ed2dbf603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 07:00:47 +00:00
Wei Li
e7937f2c3b Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist".""" am: 2e8993e882 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525828

Change-Id: I03ef5e8432ad12cecc519dc4cba1dac57112fa45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 06:15:22 +00:00
Wei Li
2e8993e882 Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist".""" 2023-04-12 05:42:17 +00:00
Kelvin Zhang
629bc8dc1c Fix s to t OTA 
Android S update_engine has a smaller minor version, we should use
update_engine version number from source build when generating an
incremental OTA.

Test: th
Bug: 277837157
Change-Id: Ic1ccdccd26c19bf9fb13d146a9151e699e481201
 2023-04-11 21:30:42 -07:00
Steve Berbary
279a5ea93c [automerger skipped] Update Security String to 2023-06-01 am: 8c6ca0a1e6 am: 3099ea1bd4 am: 084f1fe02b -s ours am: ffbcb3f857 -s ours 
am skip reason: Merged-In I4b2ea3956c34aa56cc6f54bab7148f116c34759e with SHA-1 908e3504d8 is already in history

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

Change-Id: I94acbaf75b5d246232320d8b646239eaeb64fde5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 04:00:01 +00:00
Steve Berbary
ffbcb3f857 [automerger skipped] Update Security String to 2023-06-01 am: 8c6ca0a1e6 am: 3099ea1bd4 am: 084f1fe02b -s ours 
am skip reason: Merged-In I4b2ea3956c34aa56cc6f54bab7148f116c34759e with SHA-1 908e3504d8 is already in history

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

Change-Id: I20d9887872d6403db654c1f857860baf88186880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 03:17:52 +00:00
Treehugger Robot
766eaa6d78 Merge "Invoke delta_generator directly" am: 84031f7b49 am: 651e2a94c5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529019

Change-Id: I7471c375cf5dc05680e71f64435325fb96159f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 02:49:54 +00:00
Steve Berbary
084f1fe02b Update Security String to 2023-06-01 am: 8c6ca0a1e6 am: 3099ea1bd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22555017

Change-Id: I1371b6d1dc2b545886600287cfb7501f9acdb7bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 02:46:47 +00:00
Treehugger Robot
af7728ebfe Merge "Script updates." am: b2be62551c am: acd53a5601 
Original change: https://android-review.googlesource.com/c/platform/build/+/2530965

Change-Id: I5efe54f2055cda5ae02851ae374d7e99d64ed610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 02:46:28 +00:00
Treehugger Robot
651e2a94c5 Merge "Invoke delta_generator directly" am: 84031f7b49 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529019

Change-Id: I6f09d66acc340d408b07f273aff42af0b7971c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 02:17:10 +00:00
Treehugger Robot
acd53a5601 Merge "Script updates." am: b2be62551c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2530965

Change-Id: I59d82445c2f7b474034b9fe710b429bfc17a0b42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 02:14:45 +00:00
Steve Berbary
3099ea1bd4 Update Security String to 2023-06-01 am: 8c6ca0a1e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22555017

Change-Id: I2a8e89cfaa2d4d6228b6a2a20f4064504de022ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 02:11:16 +00:00
Treehugger Robot
84031f7b49 Merge "Invoke delta_generator directly" 2023-04-12 01:00:43 +00:00
TreeHugger Robot
81383bb2de [automerger skipped] Merge "Add the system_dlkm partition to goldfish" into tm-qpr-dev am: 62c76ddc78 -s ours 
am skip reason: Merged-In I0ff1528cf4c79c9604db6302d9a3470e81aae7ee with SHA-1 8e7f862bce is already in history

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

Change-Id: I79314614e1652cc1f19232a7bfe4ff2ab7e26a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 00:18:06 +00:00
Roman Kiryanov
74acc7dd1d [automerger skipped] Add the system_dlkm partition to goldfish am: b01d27312a -s ours 
am skip reason: Merged-In I0ff1528cf4c79c9604db6302d9a3470e81aae7ee with SHA-1 8e7f862bce is already in history

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

Change-Id: I2b54087013130a0ddc43ade8a717a7f96d8d9a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 00:18:02 +00:00
Wei Li
ff8e18cf3e Revert "Revert "Copy SBOM to dist directory when running "m dist"."" 
This reverts commit fd358ae340.

Reason for revert: fixed the issues in aosp/2529028 and aosp/2524438.

Change-Id: Ieb4e6189a9357dafe81f15c72d5603166d9caa4d
 2023-04-11 23:43:54 +00:00
Treehugger Robot
b2be62551c Merge "Script updates." 2023-04-11 21:52:43 +00:00
Kelvin Zhang
ea84d42199 Fix releasetools timeouts 
Release tools test uses sleep(5) to make sure mtime on files change in a
visible way. Use hardcoded mtime instead of sleeps.

Improvement: 145.6s -> 65s

Test: atest releasetools_test
Bug: 277782284
Fixes: 277782284

Change-Id: I4d7b04707f3b6c5843cde883f43e95a1e7a69879
 2023-04-11 13:53:05 -07:00
Kelvin Zhang
fcd731e3d6 Invoke delta_generator directly 
Currently, ota_from_target_files(a python script) calls
brillo_update_payload(a bash script), which then calls delta_generator(a
C++ binary) to do the actual diffing. Having brillo_update_payload in
the middle does not offer any additional flexibility, but it makes
maintaince more difficult. Bash code is less readable and harder to
debug. Further more, everytime we want to add a new flag to
delta_generator, we have to add the flag in three places:
ota_from_target_files, brillo_update_payload, delta_generator.

Historically, brillo_update_payload was there because we inherited from
ChromeOS side. This bash scripts extracts target_files.zip and invoke
delta_generator to generate the actual OTA. Any customizations we want
on OTA must be implemented by modifying the input target_files.zip ,
Manipuating big zip files is slow and inefficient.

To make thing simpler/faster, remove the intermdiary call to
brill_update_payload. ota_from_target_files will now extract target
files and call delta_generator directly.

Test: th
Bug: 227848550
Change-Id: I44b296e43bf7921bcf48ef6a1e4021a12669739c
 2023-04-11 13:53:05 -07:00
TreeHugger Robot
62c76ddc78 Merge "Add the system_dlkm partition to goldfish" into tm-qpr-dev 2023-04-11 20:19:45 +00:00
Treehugger Robot
cbcde78d22 Merge changes from topic "presubmit-am-e7bd37b8d4a54cc5a85736dbe59d11b1" into tm-qpr-dev-plus-aosp 
* changes:
  [automerge] Update Security String to 2023-06-05 2p: 908e3504d8
  Update Security String to 2023-06-05
 2023-04-11 19:47:04 +00:00
Alex Buynytskyy
d98c43c8dd Script updates. 
- add a mode to disable finalization steps if they were already merged,
- add the extension version into commit message.

Bug: 243966946
Test: local run
Change-Id: I51505e5d5715b56f3b385d714e1aabaae06f58ed
 2023-04-11 16:51:03 +00:00
Xin Li
c350dd238e Merge TQ2A.230405.003 
Bug: 271343657
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
Change-Id: I2d6e182e3ac754c66bd6814abe96789a4bdcb701
 2023-04-11 00:00:10 -07:00
Dennis Song
7ffe8ab317 Merge "Support merging target files from directory" am: a0ffed1fa1 am: 609dd3b00f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525591

Change-Id: I4fe623e0f07875ca112b593e83c00c048ceb436d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 06:51:03 +00:00
Dennis Song
609dd3b00f Merge "Support merging target files from directory" am: a0ffed1fa1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525591

Change-Id: I48d18bac60b3c9dc3aa2636437cd421a0efcfe11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 06:06:55 +00:00
Dennis Song
a0ffed1fa1 Merge "Support merging target files from directory" 2023-04-11 05:40:05 +00:00
Steve Berbary
333b59fd7f Update Security String to 2023-06-01 
Bug: 277078610

Change-Id: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
Merged-In: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
 2023-04-11 01:59:56 +00:00
Steve Berbary
8c6ca0a1e6 Update Security String to 2023-06-01 
Bug: 277078610

Change-Id: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
Merged-In: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
 2023-04-11 01:58:24 +00:00
Steve Berbary
83110082f8 [automerge] Update Security String to 2023-06-05 2p: 908e3504d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22561221

Bug: 277078610
Change-Id: I5046a63eda6de8307fbc94d86746c2906d444688
 2023-04-11 01:55:59 +00:00
Steve Berbary
908e3504d8 Update Security String to 2023-06-05 
Bug: 277078610
Change-Id: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
 2023-04-11 01:54:58 +00:00