Commit graph

35743 commits

Author SHA1 Message Date
Wei Li
2e84027864 Add a phony target for mk2bp_remaining files.
Bug: 308452586
Test: m mk2bp_remaining; CIs
Change-Id: I3d9242db500232da281f148da6b8205ada0b72e2
2023-10-30 11:20:13 -07:00
Wei Li
52c2ea6a18 Merge "Generate SBOM of .kcm files in layoutlib." into main 2023-10-30 17:37:09 +00:00
Justin Yun
b81aa10eba Merge "Remove ro.product.vndk.version property" into main 2023-10-30 05:01:44 +00:00
Treehugger Robot
a997e48000 Merge "De-duplicate kernel module names" into main 2023-10-26 19:02:38 +00:00
Kelvin Zhang
57f23bf317 De-duplicate kernel module names
If BOARD_KERNEL_MODULES_16K contains duplicate kernel modules under
different directories, build will fail with 'multiple overriding
commands error' . To fix it, de-dup BOARD_KERNEL_MODULES_16K base on the
basename of kernel modules files.

Test: th
Change-Id: I45d850d5b3804c54b9ec0133d3a657c2db5adb17
2023-10-26 10:29:55 -07:00
Ted Bauer
6866204083 Merge "Revert "Do not generate aconfig_flags.textproto"" into main 2023-10-26 16:46:57 +00:00
Ted Bauer
49fbb31fcf Revert "Do not generate aconfig_flags.textproto"
This reverts commit 0ac5304598.

Reason for revert: unbreak FlagFlipper

Test: m
Change-Id: I3c00d97bcb39d50a54b46fb61eaa30e8fcb0c9a5
2023-10-26 10:59:34 -04:00
Wei Li
ee4ab5359d Generate SBOM of .kcm files in layoutlib.
Bug: 303905932
Test: CIs; m layoutlib dist
Change-Id: Iab35c44bdfff7ea82734a8efd37dfa005bae2664
2023-10-25 15:49:26 -07:00
Kelvin Zhang
160762a276 Use deterministic salt for AVB footer of prebuilt boot img
When target specified a prebuilt boot.img, current build system will add
avb hash footer to it with a random salt. Use a deterministic salt
instead for more reproducible builds. To stay consistent with
non-prebuilt boot.img code path, we extract the kernel image from
prebuilt boot.img and uses sha256sum of kernel image as the salt.

Test: th
Bug: 293313353
Change-Id: I988999ddc4f18e0b8677b05a3165c847b6a11b52
2023-10-25 13:28:11 -07:00
Justin Yun
f71c221f40 Remove ro.product.vndk.version property
Product modules no longer use vndk libraries but install them to
/product/lib[64].

Test: lunch cf_x86_64_phone-next-userdebug; m
Test: atest GtsVndkDependencyTestCases
Bug: 299867815
Bug: 302255959
Change-Id: I67614457c83f0f18eba7dc1d8259efeb5795807b
2023-10-25 13:24:29 +09:00
Jerome Gaillard
ea9dab478c Add key character maps to layoutlib dist files
This makes key character map files from the framework part of the
layoutlib artifacts so that they can be used in Android Studio to
handle platform key events.

Bug: 255328531
Test: N/A
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1894ff5c78ca33be85d983d28be42870bac0bed0)
Merged-In: I147159912f85daafc97364468d6a6c2cfa3916b8
Change-Id: I147159912f85daafc97364468d6a6c2cfa3916b8

NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in core/Makefile, hunk HunkHeader[7006,8->7006,8]: Hunk cannot be applied

Original patch:
 From 1894ff5c78ca33be85d983d28be42870bac0bed0 Mon Sep 17 00:00:00 2001
From: Jerome Gaillard <jgaillard@google.com>
Date: Mon, 24 Oct 2022 16:30:25 +0100
Subject: [PATCH] Add key character maps to layoutlib dist files

This makes key character map files from the framework part of the
layoutlib artifacts so that they can be used in Android Studio to
handle platform key events.

Bug: 255328531
Test: N/A
Change-Id: I147159912f85daafc97364468d6a6c2cfa3916b8
---
2023-10-25 01:15:53 +00:00
Baligh Uddin
4c09638237 Merge "Move most version variable out to relase configs." into main 2023-10-24 23:39:55 +00:00
Colin Cross
df85b8691e Make checkbuild depend on blueprint_tests
The Soong tests are being disabled by default, add them as a manual
dependency of checkbuild to esnure they still run in CI.

Bug: 269296618
Test: aninja -t path checkbuild out/host/linux-x86/bin/go/soong-java/test/test.passed
Change-Id: Ice9b5ecdef8455cd0b173edbac141861cffc28c1
2023-10-24 10:59:40 -07:00
Wei Li
420d7d5878 Merge "Initial implementation of layoutlib SBOM generation." into main 2023-10-24 17:11:20 +00:00
Jeff Hamilton
426a9f8f02 Move most version variable out to relase configs.
This allows finer control of the version variables
per release config, and removes a lot of computed
logic in favor of just directly setting the values.

Bug: 306702353
Test: lunch <device>-next-userdebug && m -j98
Change-Id: I9edc7171d124f0cfa540fea6f0e06ba877910444
Ignore-AOSP-First: Changes in internal projects first.
Merged-In: I9edc7171d124f0cfa540fea6f0e06ba877910444
2023-10-24 16:41:58 +00:00
Master
08f6715f37 sysprop: Remove commits to void build break
Reason: while building it cause echo to break, and hence props are not set
Change-Id: I7bed0e01cc71cbe37888f9d407569f8e1477d0f2
2023-10-21 04:20:14 +00:00
Treehugger Robot
9bfce20efd Merge "Add special paths for BoardConfig.mk for gf and cf" into main 2023-10-20 20:42:32 +00:00
Roman Kiryanov
8cc6b1181e Add special paths for BoardConfig.mk for gf and cf
goldfish and cuttlefish are emulator and have
many boards which makes their device folders
very crowded. This change will allow to move
all boards into a dedicated folder.

This change will go away once a more consistent
approach to search for board configurations is
implemented.

Bug: 295259752
Test: presubmit
Change-Id: I78efe5a0ecd1ca9cffbadc7d7112f50e444ff7c3
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-10-20 12:05:38 -07:00
Cole Faust
2fc2709115 Merge "Revert^2 "Enable genrule sandboxing by default"" into main 2023-10-19 23:10:55 +00:00
Sandeep Dhavale
cc1a560241 Merge "Add support for specifying erofs blocksize" into main 2023-10-19 21:46:58 +00:00
Cole Faust
b0990300e9 Revert^2 "Enable genrule sandboxing by default"
50cd6b2a18

Change-Id: Ie0be9331481eb1e9b96034b155efb76a8be9596a
2023-10-18 22:50:28 +00:00
Sandeep Dhavale
d7cc7e8f9a Add support for specifying erofs blocksize
This change allows us to specify erofs filesystem block size
which will be used to create erofs image.

Either it can be specified at board level using
BOARD_EROFS_BLOCKSIZE. Or per read only partition image
using BOARD_<PARTITION>IMAGE_EROFS_BLOCKSIZE.

Examples:
BOARD_EROFS_BLOCKSIZE := 16384 OR
BOARD_PRODUCTIMAGE_EROFS_BLOCKSIZE := 16384

Bug: 303316443
Test: m and file ${ANDROID_PRODUCT_OUT}/*.img

Change-Id: I9bf3d299ae02165d0bffc62f474a302408d8b9b9
Signed-off-by: Sandeep Dhavale <dhavale@google.com>
2023-10-18 08:23:36 -07:00
Wei Li
c134b76375 Initial implementation of layoutlib SBOM generation.
1) Build/dist build.prop, resource files
2) Generate layoutlib SBOM that includes build.prop, resource files,
   font files and font configuration files
3) Generate SBOM of framework_res.jar with placeholders for substitution
   in release_layoutlib.sh

Bug: 303903787
Bug: 303904046
Bug: 303904808
Bug: 303905932
Bug: 303906000
Bug: 303906275
Test: lunch sdk_phone64_arm64-userdebug && m layoutlib dist
Change-Id: Ib004e199e740ccc901e93b11201db2477464be1d
2023-10-17 23:52:30 -07:00
Mateusz Cicheński
2db3a45d8d Merge "Revert "Enable genrule sandboxing by default"" into main 2023-10-17 21:04:57 +00:00
Mateusz Cicheński
50cd6b2a18 Revert "Enable genrule sandboxing by default"
Revert submission 2782270-genrule_sandboxing_by_default

Reason for revert: Potential culprit for b/305851039 and many other build breakages - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2782270-genrule_sandboxing_by_default

Change-Id: I3a8eb5d3a6a9e0d51ed7798c99187e9ca236b7bd
2023-10-17 17:36:43 +00:00
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
Cole Faust
2f07f035cc Merge "Enable genrule sandboxing by default" into main 2023-10-17 00:53:09 +00: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
Cole Faust
865d19e214 Enable genrule sandboxing by default
Now that all the failing genrules have been denylisted.

Also add BUILD_BROKEN_GENRULE_SANDBOXING to disable this behavior.

Bug: 290816499
Test: Presubmits
Change-Id: Id7612065ddc976a088ea1ac4c2d959dadf2b845c
2023-10-11 15:24:31 -07: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
Xin Li
c04229bbea Merge "Merge UP1A.231005.007" into aosp-main-future 2023-09-29 06:40:54 +00:00
Cole Faust
83fe17e0a4 Revert^3 "Make the target_files zip reflect the recent partition change"
This reverts commit cb63de55b7.

Reason for revert: Still more broken devices

Change-Id: Ic55ba78dd9c2e34dc96549ac8aba65fdbefd379b
2023-09-29 00:22:27 +00:00
Cole Faust
dce3a9d66c Merge "Remove other partition's AVB properties" into main am: 06223362d7
Original change: https://android-review.googlesource.com/c/platform/build/+/2768106

Change-Id: I027f479e7cb807eec39a09dd23c5f37107246c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 23:48:44 +00:00
Cole Faust
13d374ab41 Remove other partition's AVB properties
This is to ensure a partition doesn't need to be aware of the other
partitions in order to be built.

Also sort the image info file so it's easier to compare with bazel.

Bug: 297269187
Test: m && emulator on sdk_phone_x86_64-userdebug
Change-Id: I8e4b2049f602c8db109bf53e1359751a9ed9dd7a
2023-09-28 12:04:56 -07:00
Cole Faust
2b24df300d Merge "Add extra variables to soong.variables" into main am: b78b334041
Original change: https://android-review.googlesource.com/c/platform/build/+/2765709

Change-Id: I51944fa8d61be1f2ba4a3ab3732ad77d9103245f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 17:23:44 +00:00
Cole Faust
b78b334041 Merge "Add extra variables to soong.variables" into main 2023-09-28 16:38:28 +00:00
Maxim Siniavine
2af9c2423d Merge "Revert "Add soong config variable Release_expose_flagged_api"" into main am: 377cf62987
Original change: https://android-review.googlesource.com/c/platform/build/+/2766349

Change-Id: Ia1f46a2112240fc26a90a223e903f16bf6ce3ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 01:55:21 +00:00
Maxim Siniavine
377cf62987 Merge "Revert "Add soong config variable Release_expose_flagged_api"" into main 2023-09-28 01:08:44 +00:00
Maxim Siniavine
453d74ba48 Revert "Add soong config variable Release_expose_flagged_api"
Revert submission 2755310

Reason for revert: Broken build b/302407753

Reverted changes: /q/submissionid:2755310

Change-Id: If2b09e6609cdd4c47eea12cb2d877c3874e0560b
2023-09-28 01:02:02 +00:00
Xin Li
5cca3caa48 Merge UP1A.231005.007
Bug: 291102124
Merged-In: Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f
Change-Id: I4a0d6dfe3a5b4642f5c4cdf257c84c1634888699
2023-09-27 16:08:15 -07:00
Cole Faust
c874c70f45 Add extra variables to soong.variables
Also always use BUILD_NUMBER_FROM_FILE in the BUILD_FINGERPRINT.
The build number file now always exists, even if HAS_BUILD_NUMBER is
false.

Bug: 297269187
Test: m bazel_sandwich
Change-Id: Idf745b600b167e5cec161e07139be09a037bdc13
2023-09-27 13:44:56 -07:00
Rajeev Kumar
77b936b764 Merge "Add devicelock to the list of individually toggleable module." into main am: d7965bd12c
Original change: https://android-review.googlesource.com/c/platform/build/+/2763932

Change-Id: If8e176fbff2d58c3b94f9a09fb57b18446fc36d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:45:19 +00:00
Rajeev Kumar
d7965bd12c Merge "Add devicelock to the list of individually toggleable module." into main 2023-09-27 19:06:11 +00:00
Jihoon Kang
3163daa603 Merge "Add soong config variable Release_expose_flagged_api" into main am: 19cd806de1
Original change: https://android-review.googlesource.com/c/platform/build/+/2763272

Change-Id: I1054493df1c337790d479531cb8d103ac917577f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:52:34 +00:00
Justin Yun
cd7c0300b5 Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config
We can remove PRODUCT_PRODUCT_VNDK_VERSION safely as soong does not
read it.

Bug: 302255959
Test: m
Change-Id: I1d4080b8e6f8b04c0c1333bcd9bf055d329fdd71
2023-09-27 16:38:13 +09:00
Rajeev Kumar
e71b6333c4 Add devicelock to the list of individually toggleable module.
Bug: 300099037
Test: Builds successfully
Change-Id: I4231021982819cf227f3f1298c376635e160ab72
2023-09-26 20:16:57 -07:00
Treehugger Robot
cd4c262258 Merge "Remove architecture name from names of HOST_*.mk files." into main am: 1741facdbf
Original change: https://android-review.googlesource.com/c/platform/build/+/2694564

Change-Id: I588d140258ed188b1393aa4fa5180629a8b74358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 22:38:01 +00:00
Jihoon Kang
ccebab160e Add soong config variable Release_expose_flagged_api
The variable is a release config variable which will be used to
determine whether if the api marked @FlaggedApi is exposed or not.

Test: m nothing
Bug: 299570421
Change-Id: Iad902b5ceb2e6d6e9f8fc3b81d54ce3d1896f9eb
2023-09-26 22:32:37 +00:00
Treehugger Robot
1741facdbf Merge "Remove architecture name from names of HOST_*.mk files." into main 2023-09-26 21:15:42 +00:00
Jihoon Kang
452241468c Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main am: 596d514744
Original change: https://android-review.googlesource.com/c/platform/build/+/2756249

Change-Id: I1ca8eeb8b673300129ac45cba722f8d97cbfcf17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 18:20:33 +00:00
Jihoon Kang
596d514744 Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main 2023-09-26 17:49:25 +00:00
Jiyong Park
a0d2642141 Merge "Export BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI to soong" into main am: 343fabb483
Original change: https://android-review.googlesource.com/c/platform/build/+/2759039

Change-Id: I14b2daadbf7b0b3f4bd6a1ee7c8bbc44eb8235a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 13:15:00 +00:00
Jiyong Park
343fabb483 Merge "Export BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI to soong" into main 2023-09-26 12:02:49 +00:00