Commit graph

3508 commits

Author SHA1 Message Date
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
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
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
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
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
Spandan Das
10cd857c3f Dist api_fingerprint file for droidcore
Currently it only gets disted for `sdk`

Bug: 266791853
Test: m dist droidcore, and checked out/dist/api_fingerprint.txt
Change-Id: I098c3890d7290a5f0094fea056cbc8bf1684df11
2023-02-14 21:26:55 +00:00
Treehugger Robot
fa7113c696 Merge "Support BOARD_SYSTEM_DLKM_SRC build config" 2023-02-11 09:25:04 +00:00
Kelvin Zhang
0dbfd70963 Support BOARD_SYSTEM_DLKM_SRC build config
In aosp/2323114 , BOARD_SYSTEM_DLKM_SRC is removed in favor of
BOARD_SYSTEM_KERNEL_MODULES . However, BOARD_SYSTEM_DLKM_SRC preserves
directory structure of input kernel modules, where as
BOARD_SYSTEM_KERNEL_MODULES flattens everything by copying all modules
into the same directory. This causes some issues as vendor_dlkm that
depend on system_dlkm modules now need to update their modules.dep file
due to changes in path. For backward compatibility, add support
for BOARD_SYSTEM_DLKM_SRC .

When both BOARD_SYSTEM_DLKM_SRC and BOARD_SYSTEM_KERNEL_MODULES are
set, BOARD_SYSTEM_KERNEL_MODULES will be preferred. The priority is arbitrary,
but we need a defined ordering to prevent double copying.

Test: th
Bug: 267014648
Change-Id: Ib2f5229af02ea2b7c0d96da70afed9118f484c97
2023-02-10 21:06:53 -08:00
Devin Moore
77ae07dc5b Use the init_boot partition name with avb for prebuilt
When building a target with a prebuilt init_boot image, we still need to
use the correct name for the image.

Test: m
Bug: 268050089
Change-Id: I8fd11d8c17c2c140b7cff1dd8255c8b8728ea196
2023-02-06 17:25:06 +00:00
Treehugger Robot
43cbca31e6 Merge "Add support for packaging modules.load.recovery into vendor_kernel_boot" 2023-01-27 22:55:58 +00:00
Shikha Panwar
44eccdd471 Merge "Include initrd_bootconfig in the list of OTA tools" 2023-01-27 12:11:10 +00:00
Vincent Donnefort
6133aea40f Merge "Add null and console dev nodes to the Android initramfs" 2023-01-26 09:04:33 +00:00
Isaac J. Manjarres
3a7fe9184b Add support for packaging modules.load.recovery into vendor_kernel_boot
Add support for creating a modules.load.recovery file in the
vendor_kernel_boot image when
BOARD_VENDOR_KERNEL_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD is specified.

Bug: 266752750
Change-Id: I430b785c13dca84949da5032e05025385168df07
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
2023-01-25 17:33:18 -08:00
Kelvin Zhang
0841b9076b Fix dependency issues for vbmeta.img target
Extra space in variable names causes dependencies for
INSTALLED_VBMETAIMAGE_TARGET to be missing. Remove extraneous sspaces.

Bug: 263568805
Test: lunch cuttlefish,  m distclean, m, and check
$OUT/vbmeta_vendor_dlkm.img

Change-Id: If818a8af42c407a7213f58a7142dffb9dee1fd16
2023-01-23 11:12:26 -08:00
Baligh Uddin
9170e897d0 Package blkid_static in otatools
BUG: 264426585
Test: TH
Change-Id: Ie34719e98619d18dc35add80595eddd867eaf38f
2023-01-19 18:20:55 +00:00
Cole Faust
bd5eab8477 Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS
No longer used.

Bug: 262629589
Test: m nothing
Change-Id: I3d9acf9fc3e205588161c9fb50fbe757f764d6bb
2023-01-17 15:38:33 -08:00
Treehugger Robot
b80d9d6c33 Merge "Allow vendors to add custom vbmeta partitions" 2023-01-14 00:23:02 +00:00
Shikha Panwar
d3bef475b2 Include initrd_bootconfig in the list of OTA tools
initrd_bootconfig is required for signing the virt apex & hence needs to
run outside the source tree as well.

Test: NA
Bug: 245277660
Change-Id: Id1776661e76a75cfb3cf530e7777dc4292522dd0
2023-01-13 08:28:44 +00:00
Kelvin Zhang
b81b4e3621 Allow vendors to add custom vbmeta partitions
Currently we only have vbmeta_system and vbmeta_vendor. Add
BOARD_AVB_VBMETA_CUSTOM_PARTITIONS , which allows OEMs to define
their own vbmeta_*.img partitions. example: aosp/2381823

Bug: 263568805
Change-Id: Id671e2c3aee9ada90256381cce432927df03169b
2023-01-12 17:34:42 -08:00
Vincent Donnefort
4a5fd836a1 Add null and console dev nodes to the Android initramfs
/dev/null is a security requirement for bionic, /dev/console is needed
so the kernel can set-up stdout stderr and stdin before running /init.

Bug: 254835242
Change-Id: I865856885e9957ea17e28b62273e701af9bfc56f
2023-01-12 11:25:14 +00:00
Jooyung Han
da2d4a29bf vendor/etc/linker.config.pb from multiple input files
When we have dedicated .mk files for each modules (e.g. usb, drm, etc)
and those modules have their own linker configuration requirements, it
would make more sense to have "fragments" for linker configuration.

This change introduces a new list variable to store the list of linker
configuration fragments. When it's set, vendor/etc/linker.config.pb is
generated from the list of input fragments.

Bug: 264330513
Test: set PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS
Test: m vendorimage (generates vendor/etc/linker.config.pb)
Change-Id: I9eed0f90add0191885b7195efdab94b5b1a4a62d
2023-01-10 11:57:23 +09:00
Jooyung Han
0561be3c26 Merge "checkvintf --check-one with APEXes" 2022-12-20 14:44:29 +00:00
Jooyung Han
c9cc48b412 checkvintf --check-one with APEXes
checkvintf --check-one is to check the consistency of VINTF data in a
single partition. To read VINTF from /vendor partition, it should read
/apex as well to gather VINTF from vendor apexes.

Bug: 262189711
Test: m check-vintf-all
Change-Id: I70b194f4dae47ca6080dcdfb3baa69ac7da9b653
2022-12-16 16:12:29 +09:00
Jiyong Park
e219f0068a Place unstripped pvmfw image to the symbols directory
Bug: 245896220
Test: examine the symbols.zip file on aosp_cheetah
Change-Id: I8730baa64e6ff16fcdf765dc8878771d2ec16be8
2022-12-16 14:30:03 +09:00
Treehugger Robot
8a9dffb96e Merge "Default to not generating modules.dep for system side" 2022-12-08 01:03:07 +00:00
Kelvin Zhang
395d3df406 Default to not generating modules.dep for system side
Test: th
Bug: 149866755
Change-Id: I36c26bed46f43ca8ff7d4afdaf3ee1d7e1c70c3f
2022-12-07 10:36:10 -08:00
Treehugger Robot
3de79b1806 Merge "Fix typo in cross partition dependency generation" 2022-12-07 03:33:42 +00:00
Kelvin Zhang
21b6cade74 Fix typo in cross partition dependency generation
intention was to symlink modules in vendor_dlkm to system_dlkm. Typo
caused the same modules to link itself.

Test: build, make sure vendor_dlkm's modules.dep contains system
dependency

Change-Id: I19664cd9a8578566d3a038885b8ce27556801a79
2022-12-06 16:31:02 -08:00
Treehugger Robot
b4b8760144 Merge "Generate cross partition kernel module dependencies" 2022-12-06 07:30:56 +00:00
Kiyoung Kim
eb3af10b0b Merge "Append LLNDK libraries in the APEX to the system linker config" 2022-12-06 00:48:15 +00:00
Kelvin Zhang
d5f06113b7 Generate cross partition kernel module dependencies
Kernel modules in vendor_dlkm might have dependency on system_dlkm. To
correctly generate modules.dep files, copy system_dlkm modules to depmod
staging dir before calling depmod.

Test: m, check $OUT/vendor_dlkm/lib/modules/module.dep, make sure it
contains dependency on /system/lib/modules
Bug: 149866755

Change-Id: Ibdf6d63df1413543471a3d18108eba6fdcde9ba4
2022-12-05 15:01:18 -08:00
Kelvin Zhang
ac296d5cc6 Merge "Allow empty modules.load file to be generated" 2022-12-05 22:36:08 +00:00
Treehugger Robot
056f6b2d46 Merge "target_files: Package pvmfw.bin under PVMFW/" 2022-12-05 22:00:43 +00:00
Kelvin Zhang
b66b11ec9a Allow empty modules.load file to be generated
Currently, if BOARD_*_KERNEL_MODULES_LOAD is set to empty string, we
default to load all modules listed in BOARD_*_KERNEL_MODULES. For
system_dlkm, we do not want to load any modules unless they are
dependency of vendor kernel modules. Therefore we need to create an
empty modules.load file for system_dlkm. Add 'false' as an out of band
value to indicate that an empty modules.load file should be generated.

Bug: 149866755
Test: th
Change-Id: Ieaaeb2f9a824e97671acff465bbd4da83dfd9aa0
2022-12-05 13:04:42 -08:00
Treehugger Robot
33544af4d1 Merge "Handle non-module fsv_meta files." 2022-12-05 19:21:22 +00:00
Pierre-Clément Tosi
03975ed738 target_files: Package pvmfw.bin under PVMFW/
Add the pvmfw.bin binary to the target_files archive to bring back
ATC-based change detection for pvmfw (which compares the content of
PVMFW/ between builds) and therefore bring back our TreeHugger
pre-submit tests for it. Those were introduced in c7b837872d ("Create
$(zip_root)/PVMFW & archive prebuilt used") but inadvertently removed
in d000004876 ("core: Get pmvfw.img partition from Soong").

Bug: 261393794
Test: m target-files-package
Change-Id: I0141d59154b54641cb348af3b98fe12624d5939e
2022-12-05 13:08:34 +00:00
Bob Badour
2cd353631d Handle non-module fsv_meta files.
These are binary data files--not copyrightable.

Test: m droid dist reportmissinglicenses

Change-Id: Ifb0e23aec2a1a834c66b3eb7f93acc677f552650
2022-12-02 21:06:00 +00:00
Kiyoung Kim
0c0795944c Append LLNDK libraries in the APEX to the system linker config
Some of the LLNDK libraries are in the APEX, and those should be marked
as required libs of system image, so system namespaces can link to the
APEX namespace properly. This change automates the process instead of
adding APEX LLNDKs to linker.config.json manually.

Bug: 251782700
Test: Cuttlefish build and boot succeeded
Change-Id: I538a619caa67e64e6432517e1de87f3007bccbde
2022-12-01 10:58:38 +09:00
Ramji Jiyani
49b70b67ce system_dlkm: Remove manual module copy
Rather than copying GKI modules from source folder
pointed by BOARD_SYSTEM_DLKM_SRC; use core build
macro BOARD_SYSTEM_KERNEL_MODULES as list
of GKI modules to be copied on the system_dlkm partition.

This leverages core infrastructre already present for
the kernel modules for vendor_dlkm, odm_dlkm, etc.

Bug: 232430739
Test: TH
Change-Id: Ic53f450eb426dc4ec38fc80b7ceaa625c8ab206b
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2022-12-01 00:55:10 +00:00
Jooyung Han
8af44a923f Refactor: remove --apex-info-file arg to checkvintf
Now, checkvintf finds input file from dirmaps. We don't need to pass
around --apex-info-file.

dump_apex_info also generates files under /apex without an explicit
--out_file argument.

This makes "make" know less about coupling between dump_apex_info
and checkvintf.

Bug: 260310732
Test: manually run check_target_files_vintf -v target-files
Change-Id: Ibfe31978e983e13df35c32521913d5cbc89dc1d1
2022-11-28 15:01:30 +09:00
Dennis Shen
888539c4c8 Add missing fsck.erofs and blkid to OTATOOLS
BUG: b/257882042
Change-Id: I9821106d45fa6c66f7482be2d0cdd605fe61706f
2022-11-07 18:56:47 +00:00
Treehugger Robot
99d607c0ad Merge "Unconditionally generate build_manifest.pb" 2022-11-01 23:50:05 +00:00
Victor Hsieh
921d3b0f11 Unconditionally generate build_manifest.pb
Previously, the file is generated only if there's interesting files. The
condition isn't really desirable in build rule evaluation, and makes it
a bit harder to handle in the consuming code.

Bug: 256793394
Test: atest ComposHostTestCases odsign_e2e_tests
Change-Id: I87b257b6ce6ab0ba565378c885adf35c1d25235b
2022-11-01 11:08:31 -07:00
Hongguang
07babe080a Check packages/modules before packing otatools keys
Fix build error when packages/modules is not existed.

Bug: 256565230
Test: make dist, check otatools.zip
Change-Id: I4153b143e677e35f95a3d47663cb8efcde7abdbf
2022-11-01 00:33:25 +00:00
Hongguang
547812d318 Pack the mainline modules test keys into the otatools.zip
Bug: 256565230
Test: make dist, check otatools.zip
Change-Id: I7c386ee8f8e3ec6f3d5c767504e23cb1f1bacad2
2022-10-31 10:25:29 -07:00
Anton Hansson
874dbe7b1b Revert^2 "Update naming of platforms subdir"
This reverts commit 6137ffa5de.

Reason for revert: Roll-forward with fix for codename SDKs (PS2)

Test: m sdk dist in all 3 variants of branches
Change-Id: Iffdf650a43aa050d70e01f73d78cf622cb206fc6
2022-10-28 09:03:33 +00:00