aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-10-05Merge "Install VNDK v35 in the vendor partition" into main am: f4e7e17dc4tmp_amf_298295554Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/build/+/2774164 Change-Id: I8949364d94b6263f06522992f6790c22a8ec6a5f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge "Install VNDK v35 in the vendor partition" into mainTreehugger Robot
2023-10-05Merge "Revert "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES."" into main ↵Alina Kalyakina
am: 618d848f0d Original change: https://android-review.googlesource.com/c/platform/build/+/2773151 Change-Id: Ibc6f5d1c22c4c86b48f5818235bd61b8974078d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge "Revert "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES."" into mainAlina Kalyakina
2023-10-05Install VNDK v35 in the vendor partitionJustin Yun
This is required for the vendor image with VNDK v35 to be used for the GRF configuration. This does not modify the VNDK install path before release. Bug: 299867815 Test: lunch cf_x86_64_phone-next-userdebug; m Change-Id: I689cb6dcf66cd4a23c447bd0d761677f78b0936a
2023-10-05Merge "Add zip2zip as a required module of releasetools_common." into main ↵Treehugger Robot
am: 44a7f9ccb3 Original change: https://android-review.googlesource.com/c/platform/build/+/2772848 Change-Id: I8bfe04fed26bcb3a82c94958c535f0989961046d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge "Add zip2zip as a required module of releasetools_common." into mainTreehugger Robot
2023-10-05Revert "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES."Dan Shi
This reverts commit 5346f7db625d2a851f95b20d94a30efb12dd44fb. Reason for revert: b/303552537 Change-Id: I915be23c7d234d28642c141473bf2a180ec4c3c6
2023-10-04Add zip2zip as a required module of releasetools_common.Wei Li
zip2zip is used in function ZipDelete in common.py. Bug: 303082945 Test: CIs Change-Id: I7ff1189122aac4915d411b50a6cc76bd76d658f6
2023-10-05Merge "linux-kselftest: Remove special cased build rule for kselftest" into ↵Edward Liaw
main am: 41d4b0b3af Original change: https://android-review.googlesource.com/c/platform/build/+/2736953 Change-Id: Ia5a3c3ed37738c58404dc7a9ea78d74bd509ead2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge "linux-kselftest: Remove special cased build rule for kselftest" into mainEdward Liaw
2023-10-05Merge "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES." into main am: ↵Treehugger Robot
624b0f4b2f Original change: https://android-review.googlesource.com/c/platform/build/+/2773148 Change-Id: Ifbffd104bfb476c7eb8af3aa2eeefae8a103309b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES." into mainTreehugger Robot
2023-10-04Filter REL out of PLATFORM_VERSION_ALL_CODENAMES.Dan Albert
The codename of the current release is replaced by "REL" when the build is configured as a release rather than a preview. For example, PLATFORM_VERSION_CODENAME.UpsideDownCake will be "REL" rather than UpsideDownCake in a -next target when the upcoming release is UpsideDownCake. "REL" shouldn't really be treated as a codename though. It's a placeholder to indicate that the build is a release and so doesn't really have a codename. The list of all codenames ends up in ro.build.version.all_codenames, and also ends up feeding the logic for stub generation in soong, neither of which are places that should include REL. Bug: http://b/303087088 Test: m ndk # with barbet-next-userdebug in goog/main Change-Id: I97972439e1f06c09f0ed59e7e2191c489a214e88
2023-10-04Merge "Resolve conflict AVB rollback index location" into main am: 764585118fDennis Song
Original change: https://android-review.googlesource.com/c/platform/build/+/2769020 Change-Id: I4f6d2278efb2f5553201d2ae15dfc9b176575972 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Merge "Use deterministic salt for boot image avb footer" into main am: ↵Treehugger Robot
2b181f9aa1 Original change: https://android-review.googlesource.com/c/platform/build/+/2768202 Change-Id: I834cfd2b29a2eb66f2f339108bfe9c511e6038f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Merge "Resolve conflict AVB rollback index location" into mainDennis Song
2023-10-04Merge "Use deterministic salt for boot image avb footer" into mainTreehugger Robot
2023-10-04Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into main am: ↵Justin Yun
f81405aab0 Original change: https://android-review.googlesource.com/c/platform/build/+/2763508 Change-Id: Ic94faf3c5dda0f552424fa638e8f3f33c5c2d8d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Resolve conflict AVB rollback index locationDennis Song
Add an `--avb-resolve-rollback-index-location-conflict` option in merge_target_files. When this option is set, the merge tool will resolve conflicting index locations by assigning the smallest unused index location. This is to support merging system and vendor target files from two different targets. In this case, the two target files may have conflict rollback index location because they were built independently. Test: atest releasetools_test Test: validate_target_files *-target_files-*.zip Test: merge_target_files && add_img_to_target_files && img_from_target_files && flash device Bug: 300604688 Change-Id: Ibd18ef2a9f3784157fe17966f5364c3c81c9bd9f
2023-10-04Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into mainJustin Yun
2023-10-04Merge "Clean out old rustc compiler intermediates" into main am: 842d96dc40Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/build/+/2769746 Change-Id: Id6e3465eca92f9562ee4be2acb70121128cf3b01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Merge "Clean out old rustc compiler intermediates" into mainTreehugger Robot
2023-10-03Merge "Allow installing fake vendor packages" into main am: 7683671bcdTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/build/+/2768203 Change-Id: I84f6eba29780fd637ec77c255cc3e8c702ee555a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "Allow installing fake vendor packages" into mainTreehugger Robot
2023-10-03Allow installing fake vendor packagesCole Faust
This line in base_rules.mk requires a variable that's qualified by target/host, the partition, and the module class. There didn't exist one for target/vendor/fake, so fake vendor modules failed to compile. Add a TARGET_OUT_FAKE so we can use fake vendor modules. This is aimed at using install_symlink on the vendor partition. https://cs.android.com/android/platform/superproject/main/+/main:build/make/core/base_rules.mk;l=279;drc=c67e769b8c44eeb9bb851f20003b63d35193e155 Bug: 205632228 Test: presubmits Change-Id: If4618f90cebbafcd44e88e38513033282c37c1b7
2023-10-03Use deterministic salt for boot image avb footerKelvin Zhang
avbtool by default generates a random salt everytime, this makes builds less reproducible. Use sha256 checksum of kernel image as the hex to make the build reproducible. Test: th Bug: 293313353 Change-Id: I959b3dee77654098ab9fde475f11eaee8d40c790
2023-10-03Merge "aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp" into ↵Zhi Dou
main am: d61f2efdbb Original change: https://android-review.googlesource.com/c/platform/build/+/2768479 Change-Id: I82bc0386acaf7effd4a2890deb7148570d739d91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into ↵Jihoon Kang
main am: a65cdd5024 Original change: https://android-review.googlesource.com/c/platform/build/+/2768376 Change-Id: I606e80325d05f52132acf1d940f362649817e141 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp" into mainZhi Dou
2023-10-03Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into ↵Jihoon Kang
main
2023-10-03Clean out old rustc compiler intermediatesColin Cross
The CL that splits rust complation and linking into separate actions is being reverted to save disk space. Delete the intermediates that are no longer needed in order to immediately free the disk space. Bug: 293349612 Test: builds Change-Id: I1e9f015bf9b6ffe8ba3ccd11ac3075e90640e9b3
2023-10-03Merge "Minor refactor tools/releasetools/common.py" into main am: 50e5fbd688Dennis Song
Original change: https://android-review.googlesource.com/c/platform/build/+/2769023 Change-Id: Ia0fdef30d550535aec9bd368535596198e2c6a9d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "Minor refactor tools/releasetools/common.py" into mainDennis Song
2023-10-03Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/build/+/2768739 Change-Id: I306f5cc077588f0036726a3c5da9ce5acaeffacd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "Convert gsi_skip_mount.cfg to soong" into mainTreehugger Robot
2023-10-03Minor refactor tools/releasetools/common.pyDennis Song
- Sort the import modules in alphabetical order. - Define module variables for avbtool arguments name. Test: atest releasetools_test Bug: 300604688 Change-Id: I7990b94cfc1d7b3e977ceb0a3dc2317689891229
2023-10-03Revert^2 "Add soong config variable Release_expose_flagged_api"Jihoon Kang
This reverts commit 453d74ba4899066b840db6105bdc574c1dce51c1. Change-Id: Ic5cc83ebe396ccf05b51b8306b79a61dbb689807
2023-10-02Convert gsi_skip_mount.cfg to soongCole Faust
The LOCAL_POST_INSTALL_CMD is problematic for m installclean-less builds. Bug: 205632228 Test: presubmits Change-Id: Id4eb2fd5fbd4f080aec89fa90583ac2ec97c5e1c
2023-10-02aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImpZhi Dou
Map.of can only take 10 entries. Map.ofEntries uses variable arguments. Bug: 303045451 Test: atest AconfigJavaHostTest Change-Id: I26a3fa0b8a731f9203934d4a800a5c695cfc730f
2023-10-01Merge "Copy reclient binaries into the out directory itself" into main am: ↵Kousik Kumar
0d9b3a99ef Original change: https://android-review.googlesource.com/c/platform/build/+/2766225 Change-Id: I75e52169c7ebe0d67bd2054e03f4a964656d7e47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-01Merge "Copy reclient binaries into the out directory itself" into mainKousik Kumar
2023-09-30Merge "Delete staging directory after creating module package zip" into main ↵Treehugger Robot
am: 517308b890 Original change: https://android-review.googlesource.com/c/platform/build/+/2767637 Change-Id: I560705e092b2ee8d0e0a5b5ed6786b9aa307dff8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-30Merge "Delete staging directory after creating module package zip" into mainTreehugger Robot
2023-09-30Delete staging directory after creating module package zipColin Cross
The staging directory isn't used after the module packaging zip is built. Delete the staging directory to reduce disk usage without affecting incremental build performance. Bug: 302573555 Change-Id: I377c60714f78760d0b6c2588935c12e10a9ed224 Test: treehugger
2023-09-29Merge "Revert^3 "Make the target_files zip reflect the recent partition ↵Cole Faust
change"" into main am: 985332eaca Original change: https://android-review.googlesource.com/c/platform/build/+/2768628 Change-Id: I739819707a9a5de49224ebd9bcf9b9d7bdc3a838 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29Merge "Revert^3 "Make the target_files zip reflect the recent partition ↵Cole Faust
change"" into main
2023-09-29Merge "Added new framework-pdf jar inside MediaProvider module" into main ↵Mark White
am: d577d60221 Original change: https://android-review.googlesource.com/c/platform/build/+/2760467 Change-Id: I6c7e02dbe20d457e5f63a2304665bca400879f31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29Merge "Added new framework-pdf jar inside MediaProvider module" into mainMark White
2023-09-29Merge "Merge UP1A.231005.007" into aosp-main-futureXin Li
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 15:11:49 +0000