Commit Graph

89675 Commits

Author SHA1 Message Date
Anton Hansson
228de7b72c Remove sdk_<arch> products
The SDK is arch-agnostic, so does not need per-arch products.

Bug: 205008975
Test: presubmit
Change-Id: I1847ab2bae0d07793bdd043430f0e79b36edb384
2023-10-09 14:41:30 +00:00
Treehugger Robot
02eadb873f Merge "makefile:strip generic ramdisk kernel modules in android build system." into main 2023-10-07 03:17:16 +00:00
Alyssa Ketpreechasawat
8028a4c59f Merge "Revert "Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config.""" into main 2023-10-06 19:17:40 +00:00
Alyssa Ketpreechasawat
b89b3f6108 Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main 2023-10-06 10:56:29 +00:00
Tapas Pradhan
d2d30f6baf makefile:strip generic ramdisk kernel modules in android build system.
Buganizer: 298884633
Test: manual test
Change-Id: I72b21d806ab18e8274dff04445415fe8d2613729
2023-10-06 13:30:41 +05:30
Alyssa Ketpreechasawat
0c75ea8ca7 Revert "Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config.""
This reverts commit 55702a7fb4.

Reason for revert: resubmit

Change-Id: I5ddb51159e69045ac6c370fdcd11f6bd9f86dd65
2023-10-06 07:01:03 +00:00
Alyssa Ketpreechasawat
20ef679451 Merge "Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config."" into main 2023-10-06 06:18:18 +00:00
Xin Li
564b80060f Merge "Merge Android 14" into main 2023-10-06 05:34:22 +00:00
Alyssa Ketpreechasawat
55702a7fb4 Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config."
Revert submission 2761821-suppress-hiddenapi-check

Reason for revert: have some typo - break next build

Reverted changes: /q/submissionid:2761821-suppress-hiddenapi-check

Change-Id: I24f91b77f76cf0950d407aee3dedc30412213d00
2023-10-06 03:42:42 +00:00
Alyssa Ketpreechasawat
eda7bebd77 Merge "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config." into main 2023-10-05 23:51:30 +00:00
Xin Li
ff97a435fa Merge Android 14
Bug: 298295554
Merged-In: I689cb6dcf66cd4a23c447bd0d761677f78b0936a
Change-Id: I5912541c93371a9bb0b00916b8c2404b4d96d521
2023-10-05 15:31:29 -07:00
Alyssa Ketpreechasawat
0a86673d46 Revert "Added new framework-pdf jar inside MediaProvider module"
Revert submission 2759049-framework-pdf

Reason for revert: it blocks us from enabling prebuilts in next target in main (go/stale-mainline-prebuilts for more info)

Reverted changes: /q/submissionid:2759049-framework-pdf

Change-Id: I7765daebf6a85f0c8d737c0cf163b1fdbe29f969
2023-10-05 16:09:51 +00:00
Treehugger Robot
cbceed2231 Merge "Install VNDK v35 in the vendor partition" into main am: f4e7e17dc4
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-05 13:00:33 +00:00
Treehugger Robot
f4e7e17dc4 Merge "Install VNDK v35 in the vendor partition" into main 2023-10-05 12:28:34 +00:00
Alina Kalyakina
2ea0f6db1f Merge "Revert "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES."" into main 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-05 10:24:05 +00:00
Alina Kalyakina
618d848f0d Merge "Revert "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES."" into main 2023-10-05 09:55:37 +00:00
Justin Yun
4a39d20909 Install VNDK v35 in the vendor partition
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-05 18:07:20 +09:00
Treehugger Robot
050073eaab Merge "Add zip2zip as a required module of releasetools_common." into main 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-05 07:18:30 +00:00
Treehugger Robot
44a7f9ccb3 Merge "Add zip2zip as a required module of releasetools_common." into main 2023-10-05 06:46:26 +00:00
Dan Shi
d637190deb Revert "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES."
This reverts commit 5346f7db62.

Reason for revert: b/303552537 

Change-Id: I915be23c7d234d28642c141473bf2a180ec4c3c6
2023-10-05 06:07:52 +00:00
Wei Li
9e37cf263b Add zip2zip as a required module of releasetools_common.
zip2zip is used in function ZipDelete in common.py.

Bug: 303082945
Test: CIs
Change-Id: I7ff1189122aac4915d411b50a6cc76bd76d658f6
2023-10-04 22:23:13 -07:00
Edward Liaw
a06534686f Merge "linux-kselftest: Remove special cased build rule for kselftest" into 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-05 01:48:39 +00:00
Edward Liaw
41d4b0b3af Merge "linux-kselftest: Remove special cased build rule for kselftest" into main 2023-10-05 01:08:32 +00:00
Treehugger Robot
175dd937e4 Merge "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES." into main am: 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-05 00:41:48 +00:00
Treehugger Robot
624b0f4b2f Merge "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES." into main 2023-10-05 00:08:08 +00:00
Dan Albert
5346f7db62 Filter REL out of PLATFORM_VERSION_ALL_CODENAMES.
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-04 23:11:39 +00:00
Dennis Song
a503a56283 Merge "Resolve conflict AVB rollback index location" into main am: 764585118f
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-04 17:48:05 +00:00
Treehugger Robot
006c13c27b Merge "Use deterministic salt for boot image avb footer" into main am: 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-04 17:47:15 +00:00
Dennis Song
764585118f Merge "Resolve conflict AVB rollback index location" into main 2023-10-04 17:16:11 +00:00
Treehugger Robot
2b181f9aa1 Merge "Use deterministic salt for boot image avb footer" into main 2023-10-04 17:08:25 +00:00
Justin Yun
a1822c5b6b Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into main am: 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-04 07:08:01 +00:00
Dennis Song
4aae62ee77 Resolve conflict AVB rollback index location
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-04 06:45:15 +00:00
Justin Yun
f81405aab0 Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into main 2023-10-04 06:29:31 +00:00
Treehugger Robot
8644f9c8dd Merge "Clean out old rustc compiler intermediates" into main am: 842d96dc40
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-04 00:24:55 +00:00
Treehugger Robot
842d96dc40 Merge "Clean out old rustc compiler intermediates" into main 2023-10-04 00:01:08 +00:00
Treehugger Robot
f676520f42 Merge "Allow installing fake vendor packages" into main am: 7683671bcd
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-03 23:04:26 +00:00
Treehugger Robot
7683671bcd Merge "Allow installing fake vendor packages" into main 2023-10-03 22:40:30 +00:00
Cole Faust
976a52c007 Allow installing fake vendor packages
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-03 14:27:35 -07:00
Kelvin Zhang
de53f7df43 Use deterministic salt for boot image avb footer
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-03 12:26:08 -07:00
Zhi Dou
77cb4d4606 Merge "aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp" into 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-03 18:33:05 +00:00
Jihoon Kang
078aa1a5ee Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into 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-03 18:02:14 +00:00
Zhi Dou
d61f2efdbb Merge "aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp" into main 2023-10-03 17:58:22 +00:00
Jihoon Kang
a65cdd5024 Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into main 2023-10-03 17:55:17 +00:00
Colin Cross
42f5a6bb6a Clean out old rustc compiler intermediates
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-03 10:35:32 -07:00
Dennis Song
de693db329 Merge "Minor refactor tools/releasetools/common.py" into main am: 50e5fbd688
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-03 06:58:00 +00:00
Dennis Song
50e5fbd688 Merge "Minor refactor tools/releasetools/common.py" into main 2023-10-03 06:19:23 +00:00
Treehugger Robot
b93e3b021e Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073
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-03 03:44:40 +00:00
Treehugger Robot
551570a073 Merge "Convert gsi_skip_mount.cfg to soong" into main 2023-10-03 03:06:44 +00:00
Dennis Song
6e5e44df72 Minor refactor tools/releasetools/common.py
- 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-03 02:46:51 +00:00
Jihoon Kang
00328e40be Revert^2 "Add soong config variable Release_expose_flagged_api"
This reverts commit 453d74ba48.

Change-Id: Ic5cc83ebe396ccf05b51b8306b79a61dbb689807
2023-10-03 01:02:07 +00:00