StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,332 Commits 1 Branch 0 Tags
55decf2e29e35fccb787f44f9c08b2e66293fb57
Commit Graph

8115 Commits

Author SHA1 Message Date
Treehugger Robot
55decf2e29 Merge "Create separate python libraries for the following logic and refactor SBOM generation script accordingly." am: ebf41e9a91 am: 28fc5a97a7 am: 074bfc1264 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525827

Change-Id: I0391804c0924a64ae58b71e99815cecd6c078309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 21:56:20 +00:00
Treehugger Robot
3bc1d4b99b Merge "Order entries in apex_info.pb" am: 6fb4c8dcee am: f4c40a7eb2 am: 1b07bfec46 
Original change: https://android-review.googlesource.com/c/platform/build/+/2536083

Change-Id: I55e34ce4dfb725158af0abacd814e8d638d97413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 21:56:05 +00:00
Treehugger Robot
074bfc1264 Merge "Create separate python libraries for the following logic and refactor SBOM generation script accordingly." am: ebf41e9a91 am: 28fc5a97a7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525827

Change-Id: I1e65b41eedd122d3258270a78168ef2ec83e60c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 21:23:29 +00:00
Treehugger Robot
1b07bfec46 Merge "Order entries in apex_info.pb" am: 6fb4c8dcee am: f4c40a7eb2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2536083

Change-Id: Ia8830c6718644b7239c8b0be629b5bba5518597f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 21:23:19 +00:00
Treehugger Robot
ebf41e9a91 Merge "Create separate python libraries for the following logic and refactor SBOM generation script accordingly." 2023-04-14 20:43:58 +00:00
Treehugger Robot
6fb4c8dcee Merge "Order entries in apex_info.pb" 2023-04-14 20:33:18 +00:00
Håkan Kvist
01e381954b Order entries in apex_info.pb 
Adding the entries in apex_info.pb in sorted order makes it easier to
compare ota packages generated between the same source and target on
different computers/environments, ideally the generated ota zips should
be identical.

os.listdir() was used to find the apex files which should be
included in apex_info.pb. listdir() does not guarantee any order,
solution is to sort the result to ensure consistent order.

Bug: 278095305
Test: Manual. Confirm that apex_info.pb is generated sorted
    protoc --decode_raw < apex_info.pb
Change-Id: I2851d207f828a6ac31e63e20c9025965ac4b0eba
 2023-04-14 10:36:04 +02:00
Ibrahim Kanouche
77dd8b7174 Merge "Added validation to SBOM generator" am: 8eed7f5ac6 am: bdc1b58380 am: 5f35c29870 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529120

Change-Id: Iaba3e4dfa1e695ccc7f5a4bc31ab1d2e05d3e06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 01:55:14 +00:00
Ibrahim Kanouche
5f35c29870 Merge "Added validation to SBOM generator" am: 8eed7f5ac6 am: bdc1b58380 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529120

Change-Id: Ib89082c96c8bc70f550c4438d72d26f4fa46374f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 01:24:16 +00:00
Wei Li
dec97b1462 Create separate python libraries for the following logic and refactor SBOM generation script accordingly. 
1) writer classes of generating SBOM in different SPDX formats
2) data classes to model the SBOM structure in SPDX

Bug: 272358880
Test: CIs
Test: build/soong/tests/sbom_test.sh
Test: atest --host sbom_writers_test

Change-Id: I1175cf0d99864bc4304559a59484ef0ba401cd64
 2023-04-13 13:34:57 -07:00
Ibrahim Kanouche
8c745a436b Added validation to SBOM generator 
Test: m compliance_sbom
Change-Id: I1ff2dfbc48361cfb785c64306112bc687ca51057
 2023-04-13 16:10:12 +00:00
Treehugger Robot
0cf2a44eea Merge "Fix s to t OTA" am: 64bfc41359 am: c4e1d12853 am: 858e08e0ca 
Original change: https://android-review.googlesource.com/c/platform/build/+/2531966

Change-Id: Ia479fbc12ef71408892b2078742c691662720d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:15:58 +00:00
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
64bfc41359 Merge "Fix s to t OTA" 2023-04-13 01:01:57 +00:00
Alex Buynytskyy
5571b6d758 Merge "Switch udc-dev to 'sdk finalized' mode." into udc-dev 2023-04-12 17:18:04 +00:00
Alex Buynytskyy
a89bae363d Switch udc-dev to 'sdk finalized' mode. 
Bug: 243966946
Test: run locally
Change-Id: I46026e5fe0c8442caee277a97d7777ec9631c578
 2023-04-12 10:10:20 -07:00
Kelvin Zhang
3d9c132545 Merge "Fix releasetools timeouts" am: 010bbea401 am: d434bd4c02 am: 6c5f1c32a3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2530977

Change-Id: I446582379b5919007b910f4beaf1975eea361838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 17:09:51 +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
Kelvin Zhang
010bbea401 Merge "Fix releasetools timeouts" 2023-04-12 15:37:59 +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
Treehugger Robot
3bb997b956 Merge "Invoke delta_generator directly" am: 84031f7b49 am: 651e2a94c5 am: 766eaa6d78 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529019

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

Change-Id: Id486c502493f8bfe0658ac590e0998e0f9548f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 03:15:03 +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
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
84031f7b49 Merge "Invoke delta_generator directly" 2023-04-12 01:00:43 +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
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
Dennis Song
066b7a7062 Merge "Support merging target files from directory" am: a0ffed1fa1 am: 609dd3b00f am: 7ffe8ab317 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525591

Change-Id: Ie9c358e544d5b82a6a2529570bf969c4f8c0ee82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 07:21:21 +00: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
a0ffed1fa1 Merge "Support merging target files from directory" 2023-04-11 05:40:05 +00:00
Treehugger Robot
21e87330e6 Merge "Allow setting future api level before REL" am: 52fdcf5457 am: 9358c91d08 am: fab0963700 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527081

Change-Id: I38131fc6b2933bd408caf0e31cdb9df39bcbedd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 01:52:55 +00:00
Treehugger Robot
fab0963700 Merge "Allow setting future api level before REL" am: 52fdcf5457 am: 9358c91d08 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527081

Change-Id: I9d22b49d076d6bf57b409c2871b01da79294ab70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 01:20:50 +00:00
Treehugger Robot
52fdcf5457 Merge "Allow setting future api level before REL" 2023-04-11 00:09:23 +00:00
Treehugger Robot
d3384fd665 Merge "Check if an installed file exists and report error if not." am: 0bbde41728 am: 9d38ce9784 am: 7c93b50eca 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529028

Change-Id: I76befd44c7d9b0f9894019c7b08abc6edc06f0f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 19:49:29 +00:00
Treehugger Robot
7c93b50eca Merge "Check if an installed file exists and report error if not." am: 0bbde41728 am: 9d38ce9784 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529028

Change-Id: If6ae7c5d886b560a9e6bc67690e30e8c18b2459b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 19:17:50 +00:00
Dennis Song
5bfa43e5eb Support merging target files from directory 
Expand `merge_target_files.py` API capabilities so that
`--framework-target-files` and `--vendor-target-files`
can be either zip archives or directories.

Test: Create a merged package by vendor target files folder
Test: atest --host releasetools_test
Bug: 276068400
Change-Id: I200be2a458ae59a61e05bfd7c78ab66093db32eb
 2023-04-10 17:07:03 +08:00
Justin Yun
870ea2e188 Allow setting future api level before REL 
At the dev stage, devices may set ro.board.(first_)api_level to the
future API level

Bug: 276927022
Test: test_post_process_props.py
Change-Id: I85c29af74ed8daa780278f64b023480bb6659781
 2023-04-10 15:37:19 +09:00
Wei Li
3bcd0bca6f Check if an installed file exists and report error if not. 
So far there is only one case happened in b/277039235 that an installed file in that product is moved to another directory in LOCAL_POST_INSTALL_CMD. The team agreed to convert to Android.bp, but better to add a check and report the error.

Resend this to check symlinks using os.path.islink(), which doesn't follow the link. os.path.isfile() follows symlinks and returns false since the symlinks are for devices and could not be resolved on host file systems.

Bug: 277039235
Test: m sbom
Test: build/soong/tests/sbom_test.sh
Change-Id: Ia9f1cd24dc974a3e41487bc17c9c76a26d419395
 2023-04-07 16:36:30 -07:00
Wei Li
8b6849f55d Merge "Revert "Check if an installed file exists and report error if not."" am: 0bb86d0515 am: 3b488ddaac am: a4c29b4ecc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529026

Change-Id: I6743ab4b12302ee62fe3c57225c947e277d31adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 23:08:22 +00:00
Treehugger Robot
4f2cb2a3fd Merge "Add comments explaining how secondary OTA works" am: d8e23f9519 am: a1c42f5b17 am: 579e5d2dcd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527438

Change-Id: I24e6a828ae8dd44cd39229fd86e917a8bc8e70bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 23:07:21 +00:00
Wei Li
a4c29b4ecc Merge "Revert "Check if an installed file exists and report error if not."" am: 0bb86d0515 am: 3b488ddaac 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529026

Change-Id: I5f4574afa7e9899a75834975c47e9fba644dceca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 22:37:55 +00:00
Treehugger Robot
579e5d2dcd Merge "Add comments explaining how secondary OTA works" am: d8e23f9519 am: a1c42f5b17 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527438

Change-Id: I56d60c850c851f47905d5c23a5543b3e67b29008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 22:37:28 +00:00
Wei Li
0bb86d0515 Merge "Revert "Check if an installed file exists and report error if not."" 2023-04-07 21:40:09 +00:00
Wei Li
fd559f89b5 Revert "Check if an installed file exists and report error if not." 
This reverts commit f049389e2e.

Reason for revert: the check includes more files that should not be excluded.

Change-Id: I7f7d260218826cc8fd033400b2cfaf40e4c280d0
 2023-04-07 21:35:13 +00:00
Treehugger Robot
d8e23f9519 Merge "Add comments explaining how secondary OTA works" 2023-04-07 20:57:36 +00:00
Treehugger Robot
f66ded0141 Merge "Check if an installed file exists and report error if not." am: bd5a6e882d am: 1b3b6ff8b2 am: 0ce108c06e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527433

Change-Id: Ibdb87f346766f2d24d0cf4ccd6da55cbd646c53a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 19:11:23 +00:00
Treehugger Robot
0ce108c06e Merge "Check if an installed file exists and report error if not." am: bd5a6e882d am: 1b3b6ff8b2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527433

Change-Id: I287adc2e6ac3642368e46d09fc0468819d599783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 18:37:05 +00:00
Kelvin Zhang
bd111ccae2 Add comments explaining how secondary OTA works 
Test: th
Change-Id: I72f890e3dcb6f8369dea8071da040b4c27877a2b
 2023-04-07 09:47:04 -07:00