summaryrefslogtreecommitdiff
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-24Update allowlist for partner branches Wei Li
Bug: 405307057 Test: presubmits Change-Id: I972e3e344e0e4d7b024acfc693879b8bb3ccff5e
2025-03-24Merge "Revert "Make d8-on-eng a per-module opt-out"" into main Priyanka Advani (xWF)
2025-03-24Merge "Dist Soong built target_files.zip in Soong only builds" into main Treehugger Robot
2025-03-24Merge "Add SupportFilesInfo provider" into main Zi Wang
2025-03-24Merge "Move SyncMap to blueprint." into main Yu Liu
2025-03-24Dist Soong built target_files.zip in Soong only builds Spandan Das
Test: presubmits Bug: 385383524 Change-Id: Id89e2df5ef721756b5fd4d631cfb4f17eaf48392
2025-03-24Revert "Make d8-on-eng a per-module opt-out" Satish Yalla
Revert submission 3555366-eng-d8 Reason for revert: Droidmonitor created revert due to b/405397520. Will be verified through ABTD for standard investigation. Reverted changes: /q/submissionid:3555366-eng-d8 Change-Id: Idc27a646af8e726e74665fbbb80f6fc3e510625a
2025-03-24Merge "Add Android.mk allowlist for SDV partner branches" into main Treehugger Robot
2025-03-24Merge "Add prepend_artifact_with_product attribute for dist" into main Treehugger Robot
2025-03-24Merge "Declare apps of prebuilt_apex for apkcerts.txt" into main Spandan Das
2025-03-24Add Android.mk allowlist for SDV partner branches Hugo Drumond Jacob
SDV partner branches don't have vendor/google/build/ Bug: 405928541 Test: presubmits Change-Id: Id6acf64e0a3eb11344e865c0453b0153c88297de
2025-03-24Add prepend_artifact_with_product attribute for dist Bill Yang
Add the new attribute to feet what test_package's requirement, moving the dist output naming logic from test_package to dist. Also add 4 allowed module names for the rest of the continuous_* test packages. Bug: 399246722 Test: m dist platform_tests Change-Id: I96e690f23e801c22fe66f0f234be8a1f9a84062f Merged-In: I96e690f23e801c22fe66f0f234be8a1f9a84062f
2025-03-23Merge "Add Android.mk allowlist for wearable partner branches" into main Wei Li
2025-03-23Merge "Remove host script(list_image)" into main Treehugger Robot
2025-03-22Declare apps of prebuilt_apex for apkcerts.txt Spandan Das
Make built apkcerts.txt currently creates entries for every app in the tree. When this implementation was recently changed to be limited to only the list of installed apps, it caused b/403528876. The reason for this is that the signing process signs .apks inside .apex files as well. This works fine for `apex` module type. It worked fine for `prebuilt_apex` previously because it implicitly dependend on the global nature of apkcerts.txt, i.e. that the source `android_app` will create an entry for apkcerts.txt In preparation to limit apkcerts.txt to the list of installed apps and apk-in-apexes, introduce an explicit `apps` property in `prebuilt_apex`. Bug: 399788149 Test: With RELEASE_APKCERTS_INSTALL_ONLY=true reapplied (https://r.android.com/3552561), previously failed signing test now passes https://android-build.corp.google.com/builds/abtd/run/L03300030010481704 Test: presubmits Change-Id: Icd1e702b14e068fea0f08693e0e90e26d1ec27a2
2025-03-21Merge "Quote zip2zip arg with a *." into main Treehugger Robot
2025-03-21Add Android.mk allowlist for wearable partner branches Wei Li
Wearable partner branches don't have vendor/google/build/ Bug: 405307057 Test: presubmits Change-Id: Ifecd3c6861469ae887ba4b636050ba1094fbb8fc
2025-03-21Merge "Set symbols related make variables in apexBundle's ↵ Jihoon Kang
androidMkForType()" into main
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-21Quote zip2zip arg with a *. Jeff Hamilton
Test: m out/soong/.intermediates/vendor/unbundled_google/packages/MapsPrebuilt/Maps/android_common/jnis-stripped/Maps.apk Flag: EXEMPT build system change Change-Id: I8d4db4cb18c5e96e9fec7cd2abd3f3a4b611b1b1
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-21Merge "Clear as much of cc.Module as possible after GenerateBuildActions" ↵ Colin Cross
into 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-21Set symbols related make variables in apexBundle's androidMkForType() Jihoon Kang
ALL_MODULES.$(my_register_name).SYMBOLIC_OUTPUT_PATH and ALL_MODULES.$(my_register_name).ELF_SYMBOL_MAPPING_PATH variables are used in generating symbols.zip and the elf mapping proto file. Setting these variables in the apex bundle allows the symbols of the modules included in the apex to be collected properly. Test: build mainline && inspect symbols.zip Change-Id: I08715a278e5fe508793ebee0f1e6feee1c234970
2025-03-21Merge "Use Source_apex_name for LOCAL_MODULE in Soong gen Android.mk" into main Treehugger Robot
2025-03-21Merge "Fix depfile in otatoolsPackageCertRule" into main Cole Faust
2025-03-21Merge "Print the default SOONG_ONLY value of the product in lunch output" ↵ Treehugger Robot
into main
2025-03-21Move SyncMap to blueprint. Yu Liu
Bug: 358427516 Test: Manually verified genereated ninja and mk files, unit tests. Change-Id: If2d347c39e4f2e4cae51fb5e6dcd407d79bd42df
2025-03-20Merge "Make d8-on-eng a per-module opt-out" into main Treehugger Robot
2025-03-21Use Source_apex_name for LOCAL_MODULE in Soong gen Android.mk Spandan Das
For versioned mainline prebuilts, the version is getting written to `LOCAL_MODULE` property in the generated Android.mk file, even when they set Source_apex_name. This CL uses Source_apex_name as the LOCAL_MODULE so that the versioned prebuilt does not get elided from product packaging. Test: m nothing --no-skip-soong-tests Bug: 405153030 Change-Id: I15a6c6d8a3906cced87771ddde05563209c26bc2
2025-03-20Merge "Fix overridden deps to be skipped correctly" into main Treehugger Robot
2025-03-20Merge "Use provider to get outpath in getRequiredMemberOutputFile." into main Yu Liu
2025-03-20Make d8-on-eng a per-module opt-out LaMont Jones
Several modules use defaults that set `enabled`, rather than relying on the defaults. With this change, eng builds no use d8 instead of r8, with the exception of unit tests in prebuilts/r8. Bug: b/374975543 Test: manual, TH Change-Id: I377d354f005529d04fb9d9255afa73979935f091
2025-03-20Merge "Revert^2 "Block new Android.mk added to all directories except the ↵ Wei Li
directories for partners"" into main
2025-03-20Merge changes Idda28cf7,I15782670 into main Treehugger Robot
* changes: Panic prebuilt etc module gen test if module isn't PrebuiltEtc fsgen: Use prebuilt_{root,any} in case install_in_root is set
2025-03-20Use provider to get outpath in getRequiredMemberOutputFile. Yu Liu
Bug: 377723687 Test: Unit tests and compare the ninja and mk files generated. Change-Id: Iae0d301db244f9543e4da2d6bae01b3320e3a9e4
2025-03-20This change add exported flags to droidcore Zhi Dou
This change adds exported flag check to droidcore. Then when build the cf image, it will trigger the exported flag check. Test: m Bug: 336800305 Ignore-AOSP-First: need to submit with other change, will cherry pick to aosp once submitted (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa9cafa688b7d4cd43125bae041b1be15d71e58e) Merged-In: Iff6e95784ba17c7c2f4d563a4940bcf934558acc Change-Id: Iff6e95784ba17c7c2f4d563a4940bcf934558acc
2025-03-20Fix depfile in otatoolsPackageCertRule Cole Faust
The depfile dependencies must all be on the same line as the output file. (or escape the newlines with backslashes) Bug: 395988167 Test: m otatools_package_cert_files(-soong if on soong+make builds), observe it builds. Rerun command, observe it doesn't build. touch packages/modules/adb/apex/com.android.adbd.avbpubkey and rerun command, observe it builds again. Change-Id: I2b2ee397b406488797e16b04880d0396784029fe
2025-03-20Merge "Make the order of cases stable when creating new configurables. ↵ Yu Liu
Otherwise the properties hash values will change randomly." into main
2025-03-20Merge "Rename android_info.txt to android-info.txt" into main Treehugger Robot
2025-03-20Merge "New module type to collect cert files for otatools.zip" 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