Commit Graph

36017 Commits

Author SHA1 Message Date
Treehugger Robot
b40c808d89 Merge "Add a phony target for mk2bp_remaining files." into main am: 4c56f45c50
Original change: https://android-review.googlesource.com/c/platform/build/+/2809898

Change-Id: If980aecc15f2444151b214515e000b735739157a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 22:39:09 +00:00
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
dfa5b28ce5 Merge "Generate SBOM of .kcm files in layoutlib." into main am: 52c2ea6a18
Original change: https://android-review.googlesource.com/c/platform/build/+/2802550

Change-Id: Ie5a656938763a1d8372a948572ddfc5f74274191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 17:56:15 +00:00
Wei Li
52c2ea6a18 Merge "Generate SBOM of .kcm files in layoutlib." into main 2023-10-30 17:37:09 +00:00
Justin Yun
c8651b789a Merge "Remove ro.product.vndk.version property" into main am: b81aa10eba
Original change: https://android-review.googlesource.com/c/platform/build/+/2803633

Change-Id: I66b76264bc428fc45f87a70bf37a3f864f50348d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 05:14:29 +00:00
Justin Yun
b81aa10eba Merge "Remove ro.product.vndk.version property" into main 2023-10-30 05:01:44 +00:00
Treehugger Robot
3a5de12447 Merge "De-duplicate kernel module names" into main am: a997e48000
Original change: https://android-review.googlesource.com/c/platform/build/+/2806394

Change-Id: I0939c86aa6339e838089573b60d6b30f2a246166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:37:25 +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
2e02bb7fc7 Merge "Revert "Do not generate aconfig_flags.textproto"" into main am: 6866204083
Original change: https://android-review.googlesource.com/c/platform/build/+/2803994

Change-Id: Iaf6db998aef886eb038cf5ce129fa773b7114df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 17:18:46 +00: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
Treehugger Robot
e8c4106678 Merge "Use deterministic salt for AVB footer of prebuilt boot img" into main am: 07f84b7b17
Original change: https://android-review.googlesource.com/c/platform/build/+/2794713

Change-Id: If68f49a25b1ff672d4e420c14715ff81f6b8772b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 22:02:54 +00: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
Wei Li
7ee41516be Merge "Add key character maps to layoutlib dist files" into main am: b3731e0db2
Original change: https://android-review.googlesource.com/c/platform/build/+/2802643

Change-Id: I7564c59603eb089bc09980fb78425f4b2a92c51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 18:09:09 +00: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
fd871ebe03 Merge "Make checkbuild depend on blueprint_tests" into main am: ea9d5cfbeb
Original change: https://android-review.googlesource.com/c/platform/build/+/2802294

Change-Id: Ie8af6af22c1c7fa33ca69ad500af9e2397a57c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 22:40:45 +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
Jeff Hamilton
7e2a56d9eb 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 17:41:05 +00:00
Wei Li
66b9807e09 Merge "Initial implementation of layoutlib SBOM generation." into main am: 420d7d5878
Original change: https://android-review.googlesource.com/c/platform/build/+/2795634

Change-Id: I14d489b9b65e5b29d7df5cd60aac7b96c75337a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 17:11:53 +00: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
Treehugger Robot
6d097c7d90 Merge "sysprop: Remove commits to void build break" into main am: 130bf250d2
Original change: https://android-review.googlesource.com/c/platform/build/+/2794413

Change-Id: Ic9315e9afd30e3b88bf2685bb2adc13946683ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 19:57:37 +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
f538091dba Merge "Add special paths for BoardConfig.mk for gf and cf" into main am: 9bfce20efd
Original change: https://android-review.googlesource.com/c/platform/build/+/2795597

Change-Id: I7c21db126682608867a9132f92ad548ec83987fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 21:02:05 +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
1e037ed090 Merge "Revert^2 "Enable genrule sandboxing by default"" into main am: 2fc2709115
Original change: https://android-review.googlesource.com/c/platform/build/+/2796749

Change-Id: I2874ee35b6d2cf1d4a65b5ffe55de739b9c4d3f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:22:21 +00:00
Cole Faust
2fc2709115 Merge "Revert^2 "Enable genrule sandboxing by default"" into main 2023-10-19 23:10:55 +00:00
Sandeep Dhavale
ffc0e25f2b Merge "Add support for specifying erofs blocksize" into main am: cc1a560241
Original change: https://android-review.googlesource.com/c/platform/build/+/2795057

Change-Id: I253bb798863308a5f7a6f866f57ddbfb4778f09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 22:48:10 +00:00
Sandeep Dhavale
cc1a560241 Merge "Add support for specifying erofs blocksize" into main 2023-10-19 21:46:58 +00:00
Cole Faust
3fda65df60 Merge "Add PRODUCT_PACKAGES to soong.variables" into main am: 3feef71409
Original change: https://android-review.googlesource.com/c/platform/build/+/2792192

Change-Id: Ia4336f580f3d5bb07e9d27e9b6dcf7561e175f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:30:41 +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
44d6b94afa Merge "Revert "Enable genrule sandboxing by default"" into main am: 2db3a45d8d
Original change: https://android-review.googlesource.com/c/platform/build/+/2794133

Change-Id: I2b43accb8e58bd1dd6d1bd7e886ac65a6162c21f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 21:07:12 +00: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
9dfbd5d2d5 Merge "Enable genrule sandboxing by default" into main am: 2f07f035cc
Original change: https://android-review.googlesource.com/c/platform/build/+/2782270

Change-Id: I40cfbd4020e29b043285e18d6ccbac39a6cf6ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 01:01:17 +00:00
Cole Faust
2f07f035cc Merge "Enable genrule sandboxing by default" into main 2023-10-17 00:53:09 +00:00
Lokesh Kumar Goel
c1fd8d3d53 Update Security String to 2023-12-01 am: 4ebb041135
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25055645

Change-Id: Idb91248bfc85f3c4d0852c4e9dfe462011fdfa5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 06:27:30 +00:00
Lokesh Kumar Goel
4ebb041135 Update Security String to 2023-12-01
Bug: 302612466

Change-Id: I887e3dff893647d8f43ead564887df6f3086381a
Merged-In: I887e3dff893647d8f43ead564887df6f3086381a
Ignore-AOSP-First: Internal first as its needed for preparing the release
2023-10-16 04:35:55 +00:00
Yu Liu
a5989f4760 Merge "Handle the case where the release value set is a list." into main am: 82ae713895 am: 286463c968
Original change: https://android-review.googlesource.com/c/platform/build/+/2787016

Change-Id: I906fc31f4e0f4d3163dd05b6ae05aef14a49cdb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-14 04:34:38 +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
ac5f8f2978 Merge "Add afdo profiles in AOSP to AfdoProfiles product var" into main am: c4a8d262e9 am: 41df04f17a
Original change: https://android-review.googlesource.com/c/platform/build/+/2782844

Change-Id: I898632dbedd7455bcf439331e7ab2762363e5e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 21:25:53 +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