Commit graph

35666 commits

Author SHA1 Message Date
Cole Faust
fa7445da12 Add PRODUCT_PACKAGES to soong.variables
Bug: 297269187
Test: m bazel_sandwich
Change-Id: Iea8877b7fe56f7cd0e5e227ce0e6597bdc708162
2023-10-16 18:27:23 -07:00
Yu Liu
82ae713895 Merge "Handle the case where the release value set is a list." into main 2023-10-14 03:27:30 +00:00
Vinh Tran
c4a8d262e9 Merge "Add afdo profiles in AOSP to AfdoProfiles product var" into main 2023-10-13 20:34:03 +00:00
Mårten Kongstad
e829066b58 Merge "Do not generate aconfig_flags.textproto" into main 2023-10-13 09:25:06 +00:00
Mårten Kongstad
0ac5304598 Do not generate aconfig_flags.textproto
The /<partition>/etc/aconfig_flags.textproto files are no longer needed
(all clients have migrated to use /<partition>/etc/aconfig_flags.pb).
Stop generating them.

Also update how an empty file is generated in case there are no flags
for a given partition. Previously

  echo "" > file

was used, which resulted in a file containing a newline, which caused
`printflags` to error out. Change the command to

  echo -n > file

to create an empty file.

Bug: 302452801
Bug: 304278614
Test: m nothing
Change-Id: I2f7d23df4e888046651b4155b75c5006d0b5e1d7
2023-10-13 09:49:40 +02:00
Treehugger Robot
0968914e2c Merge "Revert "Add a check that the staging directories don't..."" into main 2023-10-13 05:32:56 +00:00
Yu Liu
6ff41107dd Handle the case where the release value set is a list.
Bug: 304814040
Test: CI, unit test,
b build build/make/tools/aconfig:aconfig.test.cpp
b test build/make/tools/aconfig:AconfigJavaHostTest

Change-Id: Ie9063a6c0bd08f96e0593bad8cb731d826b25fea
2023-10-12 20:36:41 -07:00
Cole Faust
be5e391055 Revert "Add a check that the staging directories don't..."
Revert submission 2773149-partition_file_list_check

Reason for revert: b/305103467, b/305103783, b/305103468
Reverted changes: /q/submissionid:2773149-partition_file_list_check

Change-Id: I2fab3b4d7d24af4488e777ad84e12e280c42dcc0
2023-10-13 02:51:10 +00:00
LaMont Jones
fff3ee0a24 Buildifier fixes for release_config.bzl
Bug: None
Test: presubmit
Change-Id: I599c317d7a983d6e5d57b3c3153e4786a2ad9314
2023-10-12 21:21:03 +00:00
Kelvin Zhang
ad3c30528d Skip stripping 16K GKI kernel modules
GKI kernel modules are required to be signed, but curretnly we strip all
16K kernel modules. Use SYSTEM_DLKM_MODULE_PATTERNS to determine which
modules are GKI, and skip stripping for these kernel modules.

Test: boot using 16K boot image
Bug: 303725887

Change-Id: I4cd71b39ceb75650d03744220ec4ddf4aeeda871
2023-10-12 10:31:44 -07:00
Cole Faust
fe455d1c0c Merge "Add a check that the staging directories don't..." into main 2023-10-12 16:33:12 +00:00
Elliott Hughes
cf5b792e92 Merge "Microoptimize package name extraction." into main 2023-10-12 16:20:27 +00:00
Jooyung Han
737f6e5c18 APEX extraction rule mentions APEXes
so that it's triggered even when APEX list shrinks.
(-d explain will print "command line changed for ...")

To repro:
- Pick one VAPEX with vintf fragment.
- Copy the fragment to /vendor/etc/vintf/manifest (DEVICE_MANIFEST_FILE)
- `m check-vintf-all` should fail
- Remove the APEX from PRODUCT_PACKAGES
- `m check-vintf-all` should pass

Bug: 304769672
Test: m check-vintf-all
   (see above)
Change-Id: Iae9da91105faebfb8a5127fbb02a414b9ffdca10
2023-10-12 10:39:58 +09:00
Cole Faust
80fad16d14 Add a check that the staging directories don't...
...contain extra files after an installclean.

Bug: 205632228
Test: m installclean && m
Change-Id: Ib021465d1089a21bc4f43306b1441348baf71f9c
2023-10-11 17:42:34 -07:00
Elliott Hughes
707142007b Microoptimize package name extraction.
Since there's only one, and it appears early, we can stop when we find
it rather than trawl through megabytes of localized strings we don't
need to see.

Bug: https://github.com/onetrueawk/awk/issues/199#issuecomment-1756885708
Test: treehugger
Change-Id: If4d7c63da7df76c23fca417a4b727189f79e3ce6
2023-10-11 22:56:22 +00:00
Vinh Tran
72b7fab580 Add afdo profiles in AOSP to AfdoProfiles product var
Test: m libbinder and inspects build command
Change-Id: Ia72bb7e1baa5790c73cb0213217258517b09c5e9
2023-10-11 11:25:39 -04:00
Treehugger Robot
6a6e7731be Merge "Filter REL out of preview codenames." into main 2023-10-09 20:34:07 +00:00
Elliott Hughes
14e0d156fb Merge "Have the sanitizers trap rather than abort." into main 2023-10-09 16:08:06 +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
Elliott Hughes
40f0c5cad3 Have the sanitizers trap rather than abort.
abort() seems friendlier, but in practice it puts a couple of irrelevant
libc.so frames on the top of the stack trace and clobbers all the
registers that might have helped remotely debug a sanitizer failure.
Let's switch to trapping directly in the sanitized code instead.

Bug: http://b/298741930
Test: treehugger
Change-Id: I4fca63cb42bfba16a934c1fa88b08697faf3be41
2023-10-06 22:34:36 +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
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
Dan Albert
2610a328ce Filter REL out of preview codenames.
Relanding https://r.android.com/2773148 in a different way, since
removing REL from ALL_CODENAMES prevents -next builds from booting
(see the comment for the code that relies on this behavior).

This reverts commit d637190deb.

Bug: http://b/303087088
Test: m ndk # with barbet-next-userdebug in goog/main
Change-Id: I8f750645f79c3cf48a85879c36e1549df47eee97
2023-10-05 21:32:06 +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
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
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
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
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
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
Justin Yun
f81405aab0 Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into main 2023-10-04 06:29:31 +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
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
Jihoon Kang
a65cdd5024 Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into main 2023-10-03 17:55:17 +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
Treehugger Robot
5a5685a6a9 Merge "Delete staging directory after creating module package zip" into main 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-30 02:02:18 +00:00
Colin Cross
585967c08a Delete staging directory after creating module package zip
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-30 00:37:38 +00:00
Cole Faust
1c1740fab4 Merge "Revert^3 "Make the target_files zip reflect the recent partition 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-29 18:41:28 +00:00
Cole Faust
985332eaca Merge "Revert^3 "Make the target_files zip reflect the recent partition change"" into main 2023-09-29 18:09:39 +00:00