summaryrefslogtreecommitdiff
path: root/filesystem
AgeCommit message (Collapse)Author
2025-03-24Merge "Build and dist updatepackage" into main Treehugger Robot
2025-03-24Build and dist updatepackage Spandan Das
Equivalent make code: https://cs.android.com/android/_/android/platform/build/+/577341036beabe1cf4dcc479b254b878b8963b8d:core/Makefile;l=7593-7620;drc=577341036beabe1cf4dcc479b254b878b8963b8d;bpv=1;bpt=0 Some custom partitions are not included in the updatepackage. Make determines by looking at a board config variable. To implement this exclusion in Soong, a new `No_flashall` property has been added to `android_filesystem`. Bug: 383902856 Test: Built img.zip files for both make and soong Test: verified that they contain the same no. of files. Change-Id: If4df40a7ceb2ef68de27fb44f9e8db4503695e4e
2025-03-24Merge "Dist Soong built target_files.zip in Soong only builds" into main Treehugger Robot
2025-03-24Dist Soong built target_files.zip in Soong only builds Spandan Das
Test: presubmits Bug: 385383524 Change-Id: Id89e2df5ef721756b5fd4d631cfb4f17eaf48392
2025-03-21Merge changes I32e163b9,Ie2d4ad83 into main Treehugger Robot
* changes: Dist Soong built misc_info.txt in Soong only builds Do not write avb_*_key_path of android_filesystem to misc_info.txt
2025-03-21Merge changes from topic "export_flash_block_size_to_soong" into main Spandan Das
* changes: Add some OTA related properties to android_device Add `avb_custom_vbmeta_images_partition_list` to misc_info.txt
2025-03-21Merge "Create avb_recovery_add_hash_footer_args entry in misc_info.txt" into ↵ Treehugger Robot
main
2025-03-21Dist Soong built misc_info.txt in Soong only builds Spandan Das
Soong built misc_info.txt for aosp_cf_x86_64_phone is not bit-identical to Make built misc_info.txt, but I think the diffs are not meaningful. b/398036609#comment14 has some additional information on the diffs. Bug: 398036609 Test: m dist dist_files Change-Id: I32e163b9dfd55c18db6f88531653ff35167bd399
2025-03-21Do not write avb_*_key_path of android_filesystem to misc_info.txt Spandan Das
This matches the make packaging system implementaton. avb_*_key_path of bootimg, vbmeta and system_other will continue to be written to Soong built misc_info.txt Bug: 398036609 Test: Built and diff'd locally Change-Id: Ie2d4ad8362ce7f44d473ef185562c60718e173b3
2025-03-21Add some OTA related properties to android_device Spandan Das
These will be used to create misc_info.txt Bug: 398036609 Test: Built and diff'd Make and Soong misc_info.txt Change-Id: I53cd4f409c9a3a706165119c0d01f1ced5542a2b
2025-03-21Add `avb_custom_vbmeta_images_partition_list` to misc_info.txt Spandan Das
Make generates this from `BOARD_AVB_VBMETA_CUSTOM_PARTITIONS`. To generate this in Soong, a new Filesytem_partition_type is added to vbmeta modules. For the chained vbmeta partitions for cuttlefish, this will be - system - vendor - system_dlkm - vendor_dlkm android_device will query this information from its vbmeta partitions, and filter out system and vendor. Bug: 398036609 Test: Built and diff'd misc_info.txt locally Change-Id: I8ff3fe5e5e50504e49abbf89f7d50be472e64e30
2025-03-21Create avb_recovery_add_hash_footer_args entry in misc_info.txt Spandan Das
This CL creates an additional avb_recovery_add_hash_footer_args entry for bootimages with a ramdisk that contains a recovery partition. strings.ReplaceAll will be used to convert ``` --prop com.android.build.vendor_boot.fingerprint:generic/aosp_cf_x86_64_phone/vsoc_x86_64:Baklava/MAIN/eng.spanda:userdebug/test-keys ``` to ``` --prop com.android.build.recovery.fingerprint:generic/aosp_cf_x86_64_phone/vsoc_x86_64:Baklava/MAIN/eng.spanda:userdebug/test-keys ``` Test: Built and diff'd locally Bug: 398036609 Change-Id: I0caa8aa9e2e86b9c78352d3038951e00f689dc1a
2025-03-20Merge "Fix overridden deps to be skipped correctly" into main Treehugger Robot
2025-03-20Merge "Rename android_info.txt to android-info.txt" into main Treehugger Robot
2025-03-20Merge "Handle android_app_set in Soong built apkcerts.txt" into main Treehugger Robot
2025-03-20Merge "Add vbmeta partition info to misc_info.txt" into main Treehugger Robot
2025-03-20Fix overridden deps to be skipped correctly Inseob Kim
Current implementation only checks the name of the direct child and the owner of the packaging spec. But this can cause unintentionally installing unnecessary dependencies of overridden modules. This can be fixed by 1) gathering all overridden modules, 2) walking deps with skipping overridden modules, and 3) installing packages from visitied modules only. Bug: 330141242 Test: TH Test: try building pixel system image Change-Id: I4a646941b61e890b5cd2c9aa137e74c80777f837
2025-03-20Rename android_info.txt to android-info.txt Spandan Das
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug && m Test: verified that $ANDROID_PRODUCT_OUT/android-info.txt exists Bug: 404887996 Change-Id: Ie47007deba249d87dfea2010a4035df1b84e1f8f
2025-03-19Add vbmeta partition info to misc_info.txt Spandan Das
This CL introduces a PropFileForMiscInfo to vbmeta. This will contain "partition qualified" key-value pairs, and will be written to misc_info.txt Bug: 398036609 Test: Built and diff'd locally Change-Id: I607480d7bd743bd8217c83c72fec13e14a8bc210
2025-03-19Build compliance metadata for files on system_other partition Wei Li
Bug: 401369898 Test: presubmits Test: m sbom, and /system_other/system-other-odex-marker is in SBOM Change-Id: Ib32ee91ac4eaae8438a16e46dd1b04df7ae3bf33
2025-03-19Handle android_app_set in Soong built apkcerts.txt Spandan Das
android_app_set modules contain presigned apks, and uses `extract_apks` to create an entry for each split apk in `LOCAL_APK_CERTS`, which then gets concatenated to apkcerts.txt when built using Make. This logic was previously not handled correctly in the new Soong implementation, causing build errors in partner workspaces. Bug: 396131789 Test: In partner-workspace, built the soong generated apkcerts.txt file Change-Id: I7dd0dcd6c992660d5a7e7d484b5d83dc06e051f3
2025-03-19Merge "Make rollback_index configurable" into main Cole Faust
2025-03-19Merge "Add system_other partition props to Soong's misc_info.txt" into main Treehugger Robot
2025-03-18Add system_other partition props to Soong's misc_info.txt Spandan Das
Implementation Details - Expand FilesystemInfo with some Avb* props. `system_other` will use this info exported by `system` to create system_other entries for misc_info.txt. This is necessary since system_other does not contain sufficient information to create a standalone buildPropFile, and reuses the buildPropFile of system in `build_image` invocation - Harcode rollback_index to the timestamp parsed from `PlatformSecurityPatch`. Most products (including cuttlefish) do not use a product config variable to override the rollback_index. Eventually, we should dynamically get this value from one of the vbmeta partitions. Bug: 398036609 Test: Built Make and Soong misc_info.txt Test: No diff in system_other entries Change-Id: Iadb0ee34d948cb15cd5a59b0dff7bf7fc64024ed
2025-03-18Merge "Add vintf info and userdata size to Soong's misc_info.txt" into main Treehugger Robot
2025-03-18Merge "Add more entries to Soong's misc_info.txt" into main Treehugger Robot
2025-03-18Add vintf info and userdata size to Soong's misc_info.txt Spandan Das
- vintf info will be read from the global productVariables struct. This will likely need to be revisited when we have multiple android_device's in the tree - userdata has been special-cased to create a `userdata_size` entry in addition to $(filesystem)_partition_size entry. This special case matches the make misc_info.txt implementation. Bug: 398036609 Test: Built Soong's misc_info.txt locally Change-Id: I9f312c8022c5faf84442cb51f1e13043768aed53
2025-03-18Make rollback_index configurable Cole Faust
Per user request. Bug: 355539748 Test: Presubmits Change-Id: I66f9f064e2b619167772ed33ab401e45649c93c0
2025-03-18Add more entries to Soong's misc_info.txt Spandan Das
`DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS` from build/make/core/Makefile has been hardcoded in this Soong implementation. Test: Built the Soong misc_info.txt locally Bug: 398036609 Change-Id: I8ea2758116a7a326fb92b16dfddc00fe471fedb9
2025-03-18Merge changes If02923f6,I1e8e61df into main Treehugger Robot
* changes: Add more entries to Soong's misc_info.txt Add some OTA related entries to misc_info.txt
2025-03-18Add more entries to Soong's misc_info.txt Spandan Das
Note that `erofs_default_compress_hints` is different between make and soong. For CF, the former has value of `device/google/cuttlefish/shared/erofs_compress_hints.txt`, while the latter has the value of `build/make/target/product/generic/erofs_compress_hints.txt`. The contents of both these hint files are same. Test: Built and diff'd locally Bug: 398036609 Change-Id: If02923f6bdb7a53b5158c5960c0494da71473bc1
2025-03-18Add some OTA related entries to misc_info.txt Spandan Das
Corresponding make code: https://cs.android.com/android/_/android/platform/build/+/8445b1703a24d34a2c6fc789f47cf81ceda3aaea:core/Makefile;l=5957-5965;drc=519f75666431ee2926e0ec8991c682b28a4c9521;bpv=1;bpt=0 This adds a subset of the args passed to mkbootimg cmd of the bootimg deps. For cuttlefish, `header_version` seems to be the only argument added to BOARD_*_MKBOOTIMG_ARGS. Bug: 398036609 Test: Built Soong target_files.zip locally Change-Id: I1e8e61df00a538c63b7020a3c9fa027ce3e52e12
2025-03-17Merge "Additional bootimg props in misc_info.txt" into main Treehugger Robot
2025-03-17Merge "Add android_filesystem props to misc_info.txt" into main Treehugger Robot
2025-03-17Additional bootimg props in misc_info.txt Spandan Das
This CL adds avb information and bootimg sizes to misc_info.txt. text_file_processor.py will be used to insert the contents of the buildFingerprintFile into the avb footer args. Test: Built soong target_files.zip locally Bug: 398036609 Change-Id: If5b9f2c3ebf81a2e383adbc5e14aff71173ccfcc
2025-03-17Add android_filesystem props to misc_info.txt Spandan Das
Similar to https://r.android.com/3543364, this CL introduces a separate "partition qualified" prop file to `android_filesystem`. The contents of the different filesystem's will be coalesced by the top-level android_device's misc_info.txt This implementation introduces duplicates since some properties like `erofs_default_compressor` will be written multiple times to misc_info.txt. To prevent these duplicates, and also to help comparison with Make built misc_info.txt, `sort -u` has been added to misc_info.txt (There are still a lot of diffs between Make and Soong misc_info.txt) Test: Built Soong's misc_info.txt locally Bug: 398036609 Change-Id: If5ffee116d008dda5528bff0354719cec871750a
2025-03-14Merge "Move requiredDeps to OverridableDepsMutator" into main Inseob Kim
2025-03-14Merge "Change CommonModuleInfoProvider to a pointer." into main Yu Liu
2025-03-14Move requiredDeps to OverridableDepsMutator Inseob Kim
Required properties can be overridden too. This adds requiredDeps in OverridablePropertiesDepsMutator for modules like override_apex. Bug: 398089235 Test: m nothing --no-skip-soong-tests Test: boot cuttlefish, TH Change-Id: I996543764b86136b8f8ae4427f5f977c7ac6553b
2025-03-14Refactor fsTypeStr to a String function on fsType Spandan Das
Test: go build ./filesystem Change-Id: Ic389428e9ba7b60a96d0861bf46277bbe214a4ff
2025-03-14Refactor filesystem's avb_add_hashtree_footer_args into a function Spandan Das
This function will be reused to build misc_info.txt. This CL should be a noop. Test: go build ./android Bug: 398036609 Change-Id: I69d44d8aa05e68db4a77c9c1c3d9ab590cd6550e
2025-03-13Add avb info of bootimages in misc_info.txt Spandan Das
Make built $ANDROID_PRODUCT_OUT/misc_info.txt contains the avb information of the installed boot images. This info overlaps with the contents of the buildPropFile of the `bootImg` modules, but - Only some of the entries are written to misc_info.txt - misc_info.txt contains the "partition qualified" key. e.g. avb_init_boot_algorithm and not avb_algorithm This CL adds a secondary `propFileForMiscInfo` to the build actions of bootimg. This file will be propagated to android_device via a provider and cat'd to the misc_info.txt created by android_device (There are still a lot of diffs between Make and Soong misc_info.txt) Bug: 398036609 Test: Built Soong's misc_info.txt Change-Id: I0c49ebaf7a2bac934dca05bcdab65b8521b891ed
2025-03-13Partial additions to Soong's misc_info.txt implementation Spandan Das
Soong's misc_info.txt is currently missing a lot of entries. This CL adds the subset of the entries contained in dynamic_partition_info.txt. Test: Built Soong's target_files.zip locally and checked misc_info.txt file Bug: 398036609 Change-Id: I8a2497909df84d5fd72458e7d6a04c53d0ca68d3
2025-03-13Change CommonModuleInfoProvider to a pointer. Yu Liu
Bug: 358427516 Test: Manually verified genereated ninja and mk files, unit tests. Change-Id: I53a6dd718232735decbeb93febfd269dd9449e86
2025-03-12Changes for `META/dynamic_partitions_info.txt` equivalence Spandan Das
This CL changes the relative order of the entries in `dumpDynamicPartitionInfo` to match the order in `dump-dynamic-partition-info` in make. Fixes: 399788100 Test: META/dynamic_partitions_info.txt is bit identical between make and soong Change-Id: I2f522bab1bc0e87f3374ef19c7b40dbb49867f02
2025-03-11Create super_empty.img using Soong Spandan Das
The build rule for this .img file will be created in super_image. It will use the a minimized file returned by `buildMiscInfo` without any partition information. This file will be disted in target_files.zip Bug: 390192334 Test: Verified that this file is bit-identical between make and soong for aosp_cf_x86_64_phone Change-Id: I9238d67d2ca8739064509a858d5251f2641896e9
2025-03-10Merge "Remove ab_update=true from dynamic_partition_list.txt" into main Treehugger Robot
2025-03-10Merge "Rename CommonModuleInfoKey to be consistent with others." into main Yu Liu
2025-03-10Remove ab_update=true from dynamic_partition_list.txt Spandan Das
When building with Make, this entry is present only in misc_info.txt and not not in dynamic_partition_list.txt. This entry gets added to the first file via `dump-super-image-info`. This CL ports this behavior to Soong by moving this entry out of `dumpDynamicPartitionInfo` and into `buildMiscInfo` Bug: 399788100 Test: Verified that this entry is present in Soong's misc_info.txt Test: Verified that this entry is absent in Soong's dynamic_partition_info.txt Change-Id: I98384510c7f47c403ca5d7edbf863e513c9d503d
2025-03-07Merge "Include kernel and dtb.img information in SBOM built in soong-only" ↵ Wei Li
into main
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-10-19 07:43:56 +0000