Commit Graph

90603 Commits

Author SHA1 Message Date
Wei Li
6d17de56fd Merge "Support third_party.identifier in METADATA files of external packages." into main am: ee7365981e
Original change: https://android-review.googlesource.com/c/platform/build/+/2795360

Change-Id: Iff3c5598e468d6774f2d0b412af625b415f20de4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:03:09 +00:00
Wei Li
ee7365981e Merge "Support third_party.identifier in METADATA files of external packages." into main 2023-10-20 01:48:33 +00: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
Thiébaud Weksteen
a8c40d74cc Merge "Revert "Add sign_sepolicy_path for a binary to sign sepolicy.apex."" into main am: ed5abbdea4
Original change: https://android-review.googlesource.com/c/platform/build/+/2795612

Change-Id: Ibea0627ff01ab178bc141cb4e67702e0fa4077c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:03:52 +00:00
Thiébaud Weksteen
ed5abbdea4 Merge "Revert "Add sign_sepolicy_path for a binary to sign sepolicy.apex."" into main 2023-10-19 22:48:25 +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
3feef71409 Merge "Add PRODUCT_PACKAGES to soong.variables" into main 2023-10-19 18:04:08 +00:00
Wei Li
37d5a91ea3 [automerger skipped] Add zip2zip as a data dependency of releasetools_common so it is built with releasetools_common and other python_binary_host modules depend on releasetools_common. am: 5c1187e22f -s ours
am skip reason: Merged-In Iad5aa401de39516876714c854dc07aeba2f234e5 with SHA-1 6437bae07c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25097503

Change-Id: I913e8815f010304ae181e8127062f832c83309d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 23:57:44 +00:00
Wei Li
427dacb239 Support third_party.identifier in METADATA files of external packages.
Bug: 303688820
Test: CIs
Test: "m sbom" after lunch
Change-Id: Ic329d87cdcfbe4152b0fe6a8fd71c4867593b674
2023-10-18 16:45:31 -07:00
Cole Faust
b0990300e9 Revert^2 "Enable genrule sandboxing by default"
50cd6b2a18

Change-Id: Ie0be9331481eb1e9b96034b155efb76a8be9596a
2023-10-18 22:50:28 +00:00
Treehugger Robot
56e9a8577f Merge "[CrashRecovery] Add module to BCP and SSCP" into main am: d1aa0735ee
Original change: https://android-review.googlesource.com/c/platform/build/+/2710238

Change-Id: I9adfb4b6a1497c462a19b76d09482bf5cee7fd5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 17:49:05 +00:00
Treehugger Robot
d1aa0735ee Merge "[CrashRecovery] Add module to BCP and SSCP" into main 2023-10-18 17:01:24 +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
Harshit Mahajan
99e1e71e47 [CrashRecovery] Add module to BCP and SSCP
Adding framework-crashrecovery to Bootclasspath and
service-crashrecovery to System Server Classpath.

Bug: b/289203818
Test: NA

Merged-In: I488730c04ba361955344f2c41a265836923307a6
Change-Id: I488730c04ba361955344f2c41a265836923307a6
2023-10-18 11:26:47 +00: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
Treehugger Robot
cb2f3fa4d2 Merge "Install llndk.libraries.txt with llndk_in_system" into main am: bd7e1b13d2
Original change: https://android-review.googlesource.com/c/platform/build/+/2792453

Change-Id: I4fa64d70446f5366ef110977eff0637de8c618e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 03:23:02 +00:00
Treehugger Robot
bd7e1b13d2 Merge "Install llndk.libraries.txt with llndk_in_system" into main 2023-10-18 02:48:10 +00:00
Thiébaud Weksteen
62865caf1b Revert "Add sign_sepolicy_path for a binary to sign sepolicy.apex."
This reverts commit e0a977affd.

Test: atest --host releasetools_test
Bug: 297794885
Change-Id: I951277e4aa3ae1f90474a1f7a036fc8693453c53
2023-10-18 11:41:25 +11:00
Wei Li
84f9eb9dad Merge "Add zip2zip as a data dependency of releasetools_common so it is built with releasetools_common and other python_binary_host modules depend on releasetools_common." into main am: e7bf32f0de
Original change: https://android-review.googlesource.com/c/platform/build/+/2791563

Change-Id: If2a546ba4cd2f453b859db598c15d9cd8641bede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 23:52:37 +00:00
Wei Li
5c1187e22f Add zip2zip as a data dependency of releasetools_common so it is built with releasetools_common and other python_binary_host modules depend on releasetools_common.
Bug: 303082945
Test: CIs
Test: "m dev_sign_bundle" on internal udc branch and check zip2zip is built too.
(cherry picked from https://android-review.googlesource.com/q/commit:6437bae07c9510bfaa61908c1255a17e55c65742)
Merged-In: Iad5aa401de39516876714c854dc07aeba2f234e5
Change-Id: Iad5aa401de39516876714c854dc07aeba2f234e5
2023-10-17 23:12:52 +00:00
Wei Li
e7bf32f0de Merge "Add zip2zip as a data dependency of releasetools_common so it is built with releasetools_common and other python_binary_host modules depend on releasetools_common." into main 2023-10-17 23:10:46 +00:00
Ahmad Khalil
a83fa5500b Merge "Modifying base_system to use the new SoundPicker flag" into main am: cde60cac49
Original change: https://android-review.googlesource.com/c/platform/build/+/2769209

Change-Id: I9195fbfe8453acd94a25b7a2df8b92346e0670e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 21:28:00 +00:00
Ahmad Khalil
cde60cac49 Merge "Modifying base_system to use the new SoundPicker flag" into main 2023-10-17 21:22:38 +00: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
Treehugger Robot
a69d54b5c0 Merge "Put the emulator_x86_arm board back" into main am: f8a21bb924
Original change: https://android-review.googlesource.com/c/platform/build/+/2794712

Change-Id: Ie8b712f1c1a72a2b79ae50d9721a545bf330d7f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 21:06:00 +00:00
Wei Li
6437bae07c Add zip2zip as a data dependency of releasetools_common so it is built with releasetools_common and other python_binary_host modules depend on releasetools_common.
Bug: 303082945
Test: CIs
Test: "m dev_sign_bundle" on internal udc branch and check zip2zip is built too.
Change-Id: Iad5aa401de39516876714c854dc07aeba2f234e5
2023-10-17 21:05:53 +00:00
Mateusz Cicheński
2db3a45d8d Merge "Revert "Enable genrule sandboxing by default"" into main 2023-10-17 21:04:57 +00:00
Treehugger Robot
f8a21bb924 Merge "Put the emulator_x86_arm board back" into main 2023-10-17 20:37:08 +00:00
Roman Kiryanov
4a3c2b3a5c Put the emulator_x86_arm board back
ATV still needs it. ATV will make a local copy
of this board (as the only user) and after that
this change should be reverted.

Bug: 305610937
Test: presubmit
Change-Id: I873a49d0c61b2e9711a33d0ac407d4341601af61
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-10-17 12:34:48 -07:00
Dennis Shen
529ce9cf3d Merge "aconfig: support api behind a macro flag in c/cpp" into main am: 4f358fd443
Original change: https://android-review.googlesource.com/c/platform/build/+/2787279

Change-Id: I30ec3a714331b32bebc3135aa9335d011f83c77e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 17:41:50 +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
Dennis Shen
4f358fd443 Merge "aconfig: support api behind a macro flag in c/cpp" into main 2023-10-17 17:09:09 +00:00
Dennis Shen
7c124e035f aconfig: support api behind a macro flag in c/cpp
Bug: b/299673148
Test: atest aconfig.test
Change-Id: I54011de7b8eb52c97a84a93aa1cb955a9eb02706
2023-10-17 13:58:22 +00:00
Jingwen Chen
b5349d833c Merge "Support multiple module name queries with bmod." into main am: 8b87a54635
Original change: https://android-review.googlesource.com/c/platform/build/+/2787539

Change-Id: I07c82165892615b5dd3e9c21e1284888a3a016b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 09:45:02 +00:00
Jingwen Chen
8b87a54635 Merge "Support multiple module name queries with bmod." into main 2023-10-17 09:13:02 +00:00
Kiyoung Kim
da4115d959 Install llndk.libraries.txt with llndk_in_system
llndk.libraries.txt was installed from generic_system.mk when VNDK is
deprecated. However, as variable KEEP_VNDK is not valid from
generic_system.mk, it did not work as expected. Anyway, now
llndk.libraries.txt is required for product VNDK deprecation, and also
it would be better to be added as a required module with LLNDK libraries
over llndk_in_system module. This change relocates defining
llndk.libraries.txt as required module into llndk_in_system module.

Bug: 290160925
Test: aosp_cf build succeeded with llndk.libraries.txt installed under
/system/etc

Change-Id: I482f94d701e5dc2b4f01308a65824b38ba5b9fde
2023-10-17 16:01:06 +09:00
Jingwen Chen
688e5d606b Support multiple module name queries with bmod.
Test: bmod libc libm libdl
Test: bmod adb framework-minus-apex libdl
Change-Id: I156cc31185d3f97d6b5d74c232bd6cd9287cee02
2023-10-17 06:21:46 +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
Ankur Bakshi
6cbdad8443 [automerger skipped] Update Security String to 2023-12-01 am: c2b45030ce am: a8ff055371 am: e727551755 am: d5d07d1b46 am: 63bd1744a3 am: 5577e95a20 am: 62f2a20056 am: 3314794498 -s ours am: d15b1251bd -s ours
am skip reason: Merged-In I887e3dff893647d8f43ead564887df6f3086381a with SHA-1 c2b45030ce is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24933817

Change-Id: Id7313dee87879b2ccfc2c81c55c702da3b9bc29c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 22:37:40 +00:00
Ankur Bakshi
313381e13b [automerger skipped] Update Security String to 2023-12-01 am: c2b45030ce am: a8ff055371 am: e727551755 am: d5d07d1b46 am: 63bd1744a3 am: 5577e95a20 am: 6daf09868a -s ours am: 56e716ea2b -s ours
am skip reason: Merged-In I887e3dff893647d8f43ead564887df6f3086381a with SHA-1 4ebb041135 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24933817

Change-Id: I37eb5b1cf3e2ff8b14248d9ce12278b8b4813b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 22:37:29 +00:00
Ankur Bakshi
d15b1251bd [automerger skipped] Update Security String to 2023-12-01 am: c2b45030ce am: a8ff055371 am: e727551755 am: d5d07d1b46 am: 63bd1744a3 am: 5577e95a20 am: 62f2a20056 am: 3314794498 -s ours
am skip reason: Merged-In I887e3dff893647d8f43ead564887df6f3086381a with SHA-1 c2b45030ce is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24933817

Change-Id: Id673f40fd02a298b6b2f15ce42a0971bcdf6e9ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 22:37:22 +00:00
Ankur Bakshi
56e716ea2b [automerger skipped] Update Security String to 2023-12-01 am: c2b45030ce am: a8ff055371 am: e727551755 am: d5d07d1b46 am: 63bd1744a3 am: 5577e95a20 am: 6daf09868a -s ours
am skip reason: Merged-In I887e3dff893647d8f43ead564887df6f3086381a with SHA-1 4ebb041135 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24933817

Change-Id: If761fa5fac5cebe9b9df02041cc0395841161e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 22:06:24 +00:00
Ankur Bakshi
3314794498 Update Security String to 2023-12-01 am: c2b45030ce am: a8ff055371 am: e727551755 am: d5d07d1b46 am: 63bd1744a3 am: 5577e95a20 am: 62f2a20056
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24933817

Change-Id: I17f056baff6e032b64a7c104098a56ef7e38265b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 22:03:13 +00:00
Treehugger Robot
2e462a698d Merge "Remove obsolete targets from AndroidProducts.mk" into main am: 921c545981 am: 7e7c735b4a
Original change: https://android-review.googlesource.com/c/platform/build/+/2789632

Change-Id: Iac80429a82c72f869d2760f30c40ff552a25bd62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 21:31:49 +00:00
Ankur Bakshi
62f2a20056 Update Security String to 2023-12-01 am: c2b45030ce am: a8ff055371 am: e727551755 am: d5d07d1b46 am: 63bd1744a3 am: 5577e95a20
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24933817

Change-Id: I681dc255f711c1a0af7e7acb0b2da3350eefcf66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 21:15:24 +00:00