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

3550 Commits

Author SHA1 Message Date
Satoshi Futenma
792dfa537a Add merge_ota to otatools 
Bug: 282189563
Test: manual, m otatools-package, confirm that merga_ota is
    present in otatools.zip
(cherry picked from https://android-review.googlesource.com/q/commit:6d56d45f96cc1f4e45141bfd04cd92551451d3f5)
Merged-In: I40c3866bfb016aa1dec1c6dc2d95c66deb1e61ea
Change-Id: I40c3866bfb016aa1dec1c6dc2d95c66deb1e61ea
 2023-05-22 17:31:49 +00:00
Treehugger Robot
5c2fd939b9 Merge "Add create_brick_ota to otatools.zip" am: 05cffb1b2a am: fa7573bf19 am: 9563d43a64 
Original change: https://android-review.googlesource.com/c/platform/build/+/2547515

Change-Id: I7c0d25bd561e7103c2fd123e5467079cadfdd10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 11:51:26 +00:00
Kelvin Zhang
ca812338a2 Add create_brick_ota to otatools.zip 
This allows create_brick_ota binary to be used by downloading
otatools.zip from ab, instead of having to build it locally.

Bug: 278925744
Change-Id: I704355b74bc2de7e8d5b881deb01efbee0fdda2a
 2023-04-19 19:15:07 -07:00
Treehugger Robot
fd24e2486b Merge "Add partition compatibility symlinks to installed file list." am: 4ae1b2e2b1 am: d7de9d7a9d am: fbf81f8b10 
Original change: https://android-review.googlesource.com/c/platform/build/+/2514021

Change-Id: I63f934320589cf6b81d7cc3b4044181de107f5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 04:24:45 +00:00
Wei Li
e64367cf29 Add partition compatibility symlinks to installed file list. 
Bug: 272358980
Test: CIs
Test: build/soong/tests/sbom_test.sh
Change-Id: If7c6b218a13dccc2cb74358b01dd9d5db52998fc
 2023-04-05 11:06:40 -07:00
Peter Collingbourne
5c17c38778 Merge "Make kernel prebuilts writable after copying them." am: b327befaae am: 34fa001f55 am: 101d0c4a79 
Original change: https://android-review.googlesource.com/c/platform/build/+/2506189

Change-Id: I943abb51b134871262b85d3eba9124b06b46773a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 02:39:52 +00:00
Peter Collingbourne
b327befaae Merge "Make kernel prebuilts writable after copying them." 2023-04-01 00:33:43 +00:00
Treehugger Robot
5bd32b231f Merge "Create otatools build target with dist" am: a4721a5e6b am: 88b9b11bf8 am: 7cc1967008 
Original change: https://android-review.googlesource.com/c/platform/build/+/2515235

Change-Id: I6e49941a91a9a2c0481ead0d5d30c614358efe74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 03:56:54 +00:00
Dennis Shen
5acfb9c4c6 Create otatools build target with dist 
BUG: b/275545565
TEST: m otatools-dist dist
Change-Id: I8484a7927955bf694221937ba778db7065b83eb2
 2023-03-30 20:10:17 +00:00
Peter Collingbourne
fd95f097fe Make kernel prebuilts writable after copying them. 
Images created by Bazel are read-only, which leads to build failures when
later commands attempt to modify them, as the cp command will also copy
the file permissions. Fix it by using chmod to make the images writable
after copying them.

Change-Id: I8aaa7c4395d38b674f76a7f0ebfa95e1f2da0af0
 2023-03-24 16:39:17 -07:00
Wei Li
3cc80290c6 Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." am: 15187b6f1a am: 0f06273190 am: 90217d9c4c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2485540

Change-Id: I1f3f461e3311b8538431c95134c369f6ffa3cdac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 07:03:42 +00:00
Wei Li
15187b6f1a Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." 2023-03-15 05:20:44 +00:00
Wei Li
499333616c Generate SBOM of the target product in file sbom.spdx.json in product out directory. 
Original aosp/2374663 was reverted, so this change cnotains the implementation but disabled by default and SBOM will not be built by default with "m dist".

The feature will be enabled later in small CLs after running tests successfully in forrest.

Test: m sbom
Test: m dist
Test: on aosp, lunch aosp_bluejay-userdebug && m dist
Bug: 266726655
Change-Id: I926d0f97f3a0330ef61d059f12ea660005d370e6
 2023-03-14 15:14:06 -07:00
Treehugger Robot
c189bbce54 Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6 am: 90a8a8b81c am: f63e3bcc68 
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085

Change-Id: I902fedcad79461d179d8264a5fac511bbeaaa0c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 17:28:11 +00:00
Treehugger Robot
d4248892e6 Merge "add make_erofs to otatools to support erofs apex" 2023-03-14 15:47:05 +00:00
Kevin Han
21f3289c94 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f am: a27f3cef8b am: db4eccb0b2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539

Change-Id: I59fe77902d69477667e0f6165549a58297c59f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 22:56:18 +00:00
Kevin Han
afb2495f6f Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" 2023-03-13 21:03:22 +00:00
Kevin Han
161d711d4d Revert "Generate SBOM of the target product in file sbom.spdx in..." 
Revert submission 2481062-sbom

Reason for revert: b/273332655

Reverted changes: /q/submissionid:2481062-sbom

Change-Id: Ie8a73d8dc50592204acd489482e0e9d96ffbd5df
 2023-03-13 20:57:37 +00:00
Wei Li
d6fba2a779 Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 27d32b0957 am: 1f2ba11661 am: 4534fbc056 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481062

Change-Id: Ida57382107218ac24e4465dd10888eec738d364b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:00:19 +00:00
Wei Li
27d32b0957 Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." 2023-03-13 17:43:59 +00:00
Wei Li
88ac7ae7df Generate SBOM of the target product in file sbom.spdx in product out directory. 
Original aosp/2374663 was reverted, try to submit it again with some fixes in this.

Test: m sbom
Test: m dist
Test: on aosp, lunch aosp_bluejay-userdebug && m dist
Bug: 266726655
Change-Id: Icf305770473f0c448a1ad721cbe7addf737115e4
 2023-03-13 17:38:04 +00:00
Wei Li
3ce3f29f3d Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: 82308a21a3 am: edd91aa259 am: 6f57b6d309 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481755

Change-Id: I24bb03108b69c00fe3c494b26ceccf34006c8411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:48:50 +00:00
Wei Li
82308a21a3 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" 2023-03-10 06:40:54 +00:00
Android Culprit Assistant
95c3ea8704 Revert "Generate SBOM of the target product in file sbom.spdx in..." 
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/5b65d203-d364-4ade-aabb-1330fe45236a).

Change-Id: I4c7d7645ec0c266eb4d591b3089ba02e78da0659
 2023-03-10 06:18:03 +00:00
Wei Li
ae780fd76e Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 4e2aed055b am: 0939a08e0c am: cfd8bb8d8d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2374663

Change-Id: I8b023cecc0929ab6e2706169a64c115896cedaec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 05:50:58 +00:00
Wei Li
4e2aed055b Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." 2023-03-10 04:47:47 +00:00
Jooyung Han
97d8898ea5 Merge "Remove the old output of conv_linker_config" am: 580af1bab9 am: 774c439bd8 am: 864e5b9a2c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2479575

Change-Id: I1fd516b91202adc2fa6aa1625a43ae4ae23e41f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 03:24:35 +00:00
Wei Li
02797aa70e Generate SBOM of the target product in file sbom.spdx in product out directory. 
Test: m sbom
Test: m dist
Bug: 266726655
Change-Id: I6464fa2dc416dea62c5cf688c923d6b496f044f5
 2023-03-09 15:27:58 -08:00
Jooyung Han
49bf691c65 Remove the old output of conv_linker_config 
With 3397b6a2aadf8c2eb808fa38f7d6c07d5c82f320 in build/soong,
conv_linker_config fails when the output exists.

For system/vendor partitions, linker.config.pb files are built by
a custom rule, which is missing the removal of the old output. It would
fail with incremental build.

We could fix this by adding --force to overwrite. But I just added `rm`
following the convention in Makefile.

Bug: n/a
Test: m && (touch input of /vendor/etc/linker.config.pb)
      m (again)
Change-Id: Iaeaf861e90b9535394d94c6b16229a4f566789d5
 2023-03-09 16:47:32 +09:00
Dennis Shen
03ef64b134 add make_erofs to otatools to support erofs apex 
Change-Id: I272e7a689c563ac0a266e6cd86984fc85a3380b9
 2023-03-08 23:49:30 +00:00
Jooyung Han
74e8c32dba Merge "Add dependency to /vendor/etc/linker.config.pb" am: cd10355f3e am: 741d079d3c am: 3540f51a33 
Original change: https://android-review.googlesource.com/c/platform/build/+/2473687

Change-Id: I8e4d7d31f72f88d164d2010ddf946060c24c5992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 03:24:06 +00:00
Treehugger Robot
83cc7e0e60 Merge "Create vendor/etc/linker.config.pb with STUB_LIBRARIES" am: 8cd77dcec6 am: cf0325c0c0 am: 218232234c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2470880

Change-Id: I700ff0d0b37d77a4cc2567ccb60083e89ae18710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 20:33:40 +00:00
Jooyung Han
63975d73b1 Add dependency to /vendor/etc/linker.config.pb 
The rule for the file should depend on vendor files. Otherwise, the rule
can be fired before installation of those stub libraries in /vendor/lib.

Bug: 244531518
Test: m (with a vendor lib with stubs)
Test: check /vendor/etc/linker.config.pb (should have the lib)
    $ conv_linker_config print -s $OUT/vendor/etc/linker.config.pb
Change-Id: If7a81e26a7a105234201b10cd58825c67a1d5967
 2023-03-07 18:28:18 +09:00
Jooyung Han
8c119032f4 Create vendor/etc/linker.config.pb with STUB_LIBRARIES 
system/etc/linker.config.pb is automatically populated with
STUB_LIBRARIES. We do the same for vendor/etc/linker.config.pb.

Bug: 244531518
Test: m vendorimage
Change-Id: If930ca07fcf7c6830b70a0332dae05365b90db12
 2023-03-04 08:32:34 +09:00
Treehugger Robot
1eb9f4fceb Merge changes I7266c0cc,I3caba054 am: c986b3ada3 am: 6e6fb8291f am: 931b1ea788 
Original change: https://android-review.googlesource.com/c/platform/build/+/2464633

Change-Id: I66194dba5b13e655b2b2780a2cc1a11138a75a15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 01:10:25 +00:00
Treehugger Robot
68654c7198 Merge "BUILT_KERNEL_CONFIGS_FILE built by linux tools" am: 37600f4573 am: b7ee2672ec am: bbfc27134d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2464631

Change-Id: I3836a3f53de2323ba5f410cba0a37a16df58b773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 01:06:22 +00:00
Bob Badour
df0f55e526 Assert copyright on log contents. 
Test: m droid dist
Change-Id: I7266c0cc7c1517482e3aa66f8c7df3a6fbe484fe
 2023-03-01 10:34:34 -08:00
Bob Badour
7cc4e334ca BUILT_KERNEL_CONFIGS_FILE built by linux tools 
Doesn't qualify as 0p. Use kernel license text.

Test: m droid dist
Change-Id: Ideb88128b3c0f250d4c978291a028b2952b73ba9
 2023-03-01 10:16:04 -08:00
Treehugger Robot
52cf1e32b1 Merge "Add zip2zip to dependency of relevant binary targets" am: fddcbb03a1 am: 36b1360655 am: b938d10522 
Original change: https://android-review.googlesource.com/c/platform/build/+/2447682

Change-Id: I9d3caf5df45e089a0c7eadae336a639f2b72c4f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 22:28:17 +00:00
Treehugger Robot
fddcbb03a1 Merge "Add zip2zip to dependency of relevant binary targets" 2023-02-22 19:46:32 +00:00
Kelvin Zhang
6d366d36e4 Add zip2zip to dependency of relevant binary targets 
Bug: 269735619
Change-Id: I7eb3de066ec17cfcb072b4072997e3bafa83fbcd
 2023-02-21 12:49:20 -08:00
Vincent Donnefort
25ebc644b0 Merge "Fix missing dev nodes in init_boot.img ramdisk" am: 65af9993b3 am: 07738c42b2 am: f74012fd97 
Original change: https://android-review.googlesource.com/c/platform/build/+/2442241

Change-Id: I142ca30374f2f8b003736b67958a2ccfaad3d1e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-20 12:47:37 +00:00
Vincent Donnefort
6e861e9cf8 Fix missing dev nodes in init_boot.img ramdisk 
Previously ("Add null and console dev nodes to the Android initramfs")
introduced into init_boot.img the /dev/console and /dev/null nodes.
Sadly, it missed changing the release tools which are also generating
images in their own way.

Bug: 254835242
Change-Id: I4d2893ac24c09cf0d117422cbe2bde66083e7118
 2023-02-17 10:52:28 +00:00
Treehugger Robot
e89a74a47b Merge "Rename otatools dependency from futility to futility-host" am: 272d090d39 am: 287c48cda6 am: d1b9531f3a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2264495

Change-Id: I0ed6360fbae1b204863f6ef6344219a2a2465e6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-16 09:48:18 +00:00
Treehugger Robot
272d090d39 Merge "Rename otatools dependency from futility to futility-host" 2023-02-16 07:39:05 +00:00
Aaron Kling
e380321735 Rename otatools dependency from futility to futility-host 
The futility target for host is futility-host. This is required for
ryu out of tree signing.

Change-Id: I6c06ec69f991abc23597e19dd4478774cc4d56c4
 2023-02-15 21:12:23 +00:00
Spandan Das
5f8e2b94e9 Merge "Dist api_fingerprint file for droidcore" am: d3e1b41c33 am: 3c48d0938d am: 48b2aa9d87 
Original change: https://android-review.googlesource.com/c/platform/build/+/2435767

Change-Id: I8aec4a6465d716ea277f4293e2f680d6822b37d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-15 20:40:40 +00:00
Kelvin Zhang
7a76cc5d56 Merge "Copy all files from BOARD_SYSTEM_DLKM_SRC" am: 8ffc90d4e9 am: f0a1afdd56 am: 1edd6337e8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2435770

Change-Id: Ib66f1671fa16902f712ea3bcb5ee9492fa7615f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-15 20:35:39 +00:00
Spandan Das
d3e1b41c33 Merge "Dist api_fingerprint file for droidcore" 2023-02-15 18:06:27 +00:00
Kelvin Zhang
19961b53c4 Copy all files from BOARD_SYSTEM_DLKM_SRC 
BOARD_SYSTEM_DLKM_SRC might contain files such as modules.dep. These
files also need to be copied, so relax the globbing pattern to copy all
files under BOARD_SYSTEM_DLKM_SRC.

Test: th
Bug: 267014648
Change-Id: I1fef8f8d7fe01fd4bd99d62981c108d95ef47bfe
 2023-02-14 18:23:28 -08:00