StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,413 Commits 1 Branch 0 Tags
9113badc39c4d86301277b51a1393258cfbdfe0c
Commit Graph

85413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Android Build Coastguard Worker
bb7d8d6759 [coastguard skipped] Merge sparse cherrypicks from sparse-9899552-L49500000959785733 into tm-qpr3-release. 
COASTGUARD_SKIP: I87f1a8f9ebd03ee4f51d13362abbbdb5e51bbe0a

Change-Id: Ib3504b8c4e233b778db56410bed638dde74fd828
 2023-04-11 01:17:21 +00:00
Android Build Coastguard Worker
98e20b0d4e Version bump to TQ3A.230407.001.A1 [core/build_id.mk] 
Change-Id: I87f1a8f9ebd03ee4f51d13362abbbdb5e51bbe0a
 2023-04-11 01:11:18 +00:00
Treehugger Robot
9358c91d08 Merge "Allow setting future api level before REL" am: 52fdcf5457 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527081

Change-Id: I71f5e276257d16b1df32d762599d13a9f97f24aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 00:50:10 +00:00
Android Build Coastguard Worker
0cb8f7cb50 Version bump to TQ3A.230411.002 [core/build_id.mk] 
Change-Id: Ie5d8ee6c5b777ffb7feaec28773b81b8473664ce
 2023-04-11 00:41:11 +00:00
Treehugger Robot
52fdcf5457 Merge "Allow setting future api level before REL" 2023-04-11 00:09:23 +00:00
Android Build Coastguard Worker
2b00b5cba4 Make change and version bump to TQ3A.230411.001 
Snap for 9913811 from d7637446be to tm-qpr3-release

Change-Id: I553791519b6035a1c809164b84f18ae1e7d7faf4
 2023-04-11 00:07:11 +00:00
Roman Kiryanov
b01d27312a Add the system_dlkm partition to goldfish 
required by GKI

Bug: 277230251
Test: atest -c vts_dlkm_partition_test
Change-Id: I0ff1528cf4c79c9604db6302d9a3470e81aae7ee
Merged-In: I0ff1528cf4c79c9604db6302d9a3470e81aae7ee
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-04-10 16:30:32 -07:00
Android Build Coastguard Worker
3f9ea4a032 [coastguard skipped] Merge sparse cherrypicks from sparse-9909837-L44900000959775656 into tm-qpr3-release. 
COASTGUARD_SKIP: Iae83e94d26055a013b9ec6b7c7047ccd4a4bec47

Change-Id: I513a8f9e8592b9d2dda205a7a7f1f1973ec13464
 2023-04-10 21:11:34 +00:00
Android Build Coastguard Worker
cae430a869 Version bump to TQ3A.230410.001.X1 [core/build_id.mk] 
Change-Id: Iae83e94d26055a013b9ec6b7c7047ccd4a4bec47
 2023-04-10 20:54:19 +00:00
Roman Kiryanov
3d0eaa9fa1 [automerger skipped] Remove conditions around PRODUCT_USE_DYNAMIC_PARTITIONS am: d7637446be -s ours 
am skip reason: Merged-In Ie0234187fd4689211f0d4530f9b96027567273ad with SHA-1 6a4773340a is already in history

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

Change-Id: Ide139364799bc23085f57bae55d4bdc75f97e428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 20:51:42 +00:00
Roman Kiryanov
721bee4bbf [automerger skipped] Retire QEMU_USE_SYSTEM_EXT_PARTITIONS am: b790c9f1db -s ours 
am skip reason: Merged-In Iace22e384976663a8b6e4d1c474c1e2d0f90ec74 with SHA-1 6715e76360 is already in history

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

Change-Id: I51f7b4dbec42a890dc3e5e6b582be614cb78134e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 20:51:30 +00:00
Roman Kiryanov
b97a105522 [automerger skipped] Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64 am: 9e8e6a7329 -s ours 
am skip reason: Merged-In I31fed64619e26a1c690a6cf086c644757e45a878 with SHA-1 fd5e673f9f is already in history

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

Change-Id: I063caa8ad7234cff47e1c02a4aaa19496c9cb64f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 20:51:11 +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
Treehugger Robot
9d38ce9784 Merge "Check if an installed file exists and report error if not." am: 0bbde41728 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529028

Change-Id: Id2cea3cfa9d23671c659070bd505005b254b170d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 18:25:34 +00:00
Roman Kiryanov
52b797e741 Remove emulator dependencies on non emulator targets (1) 
Bug: 266607613
Bug: 111538404
Test: presubmit
Change-Id: I2c8870d68696f39277a503081c91274b0e9ec1bd
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-04-10 10:53:25 -07:00
Treehugger Robot
0bbde41728 Merge "Check if an installed file exists and report error if not." 2023-04-10 17:49:32 +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
Jooyung Han
ac1368846a Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" am: c3610a1ae7 am: ac31a9eee0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2508495

Change-Id: I45f62954cf5cc3a858d2915815dc1f0a91dadbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 09:02:48 +00:00
Jooyung Han
ac31a9eee0 Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" am: c3610a1ae7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2508495

Change-Id: If536c973715525433053fa48cb42a456256db41a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 08:19:40 +00:00
Jooyung Han
c3610a1ae7 Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" 2023-04-10 08:00:51 +00: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
Jooyung Han
06075e6543 Add TARGET_USES_AOSP_FOR_WLAN soong variable 
It's set and used in many .mk files. Adding this to "wifi" soong config
namespace helps migration of those .mk files into .bp files.

Bug: 273376293
Test: m libwifi-hal libwifi-hal-qcom
Merged-In: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
Change-Id: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
 2023-04-10 04:02:06 +00:00
Android Build Coastguard Worker
1895718725 Make change and version bump to TQ3A.230410.001 
Snap for 9909434 from 1658acefc6 to tm-qpr3-release

Change-Id: Ic15331f8f96ba5ed2fb5209ff7d802aa8363a25f
 2023-04-09 21:59:56 +00:00
Android Build Coastguard Worker
e95c6de90e Make change and version bump to TQ3A.230409.001 
Snap for 9908614 from 1658acefc6 to tm-qpr3-release

Change-Id: Ia2ca290e239a6f35a016ca4701f1881a5e7a9029
 2023-04-08 23:59:20 +00:00
Treehugger Robot
b01b05bf69 Merge "Remove device.mk" am: 3665d8dfa8 am: 85d032fb46 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529027

Change-Id: Ica5ebc5e3f8112d5eeb7d33690f6a10d93bdff96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-08 04:37:42 +00:00
Treehugger Robot
85d032fb46 Merge "Remove device.mk" am: 3665d8dfa8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529027

Change-Id: I0ccce688a70e04bca2cf832db4447b949b007c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-08 04:08:09 +00:00
Treehugger Robot
3665d8dfa8 Merge "Remove device.mk" 2023-04-08 03:30:16 +00:00
Android Build Coastguard Worker
73af897094 Make change and version bump to TQ3A.230408.001 
Snap for 9905614 from 1658acefc6 to tm-qpr3-release

Change-Id: Ia82b78b6593e3de2061850ce4b5ed3331472ddf9
 2023-04-08 02:00:02 +00: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
Cole Faust
5752005ee4 Remove device.mk 
It just consisted of unused functions/variables, and had no edits
since the initial publish of android to git. It appears like it was
panned to have a device config similar to product config but was never
completed.

Test: Presubmits
Change-Id: I0ffcef1ae8bfd0611f1bede387f0c3e01fe53581
 2023-04-07 16:03:58 -07: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
3b488ddaac Merge "Revert "Check if an installed file exists and report error if not."" am: 0bb86d0515 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529026

Change-Id: I43b48c58deda34e371f9572504a2540db75ed671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:52:00 +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
Treehugger Robot
a1c42f5b17 Merge "Add comments explaining how secondary OTA works" am: d8e23f9519 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527438

Change-Id: Ib43745870dbb47aa9d8d79aacac7ead9937739a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:37:05 +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