Commit graph

33045 commits

Author SHA1 Message Date
Dennis Shen
03ef64b134 add make_erofs to otatools to support erofs apex
Change-Id: I272e7a689c563ac0a266e6cd86984fc85a3380b9
2023-03-08 23:49:30 +00:00
Jooyung Han
741d079d3c Merge "Add dependency to /vendor/etc/linker.config.pb" am: cd10355f3e
Original change: https://android-review.googlesource.com/c/platform/build/+/2473687

Change-Id: I3f8addf829fafda072aff26f3e9d63a1f5c09394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 02:11:51 +00:00
Jooyung Han
cd10355f3e Merge "Add dependency to /vendor/etc/linker.config.pb" 2023-03-08 01:34:23 +00:00
Evgenii Stepanov
fd3a7181df Merge "Add armv9-a arch variant." am: e497e7dfba
Original change: https://android-review.googlesource.com/c/platform/build/+/2471731

Change-Id: If684ebdabe50db2c7c78692e861aab8717e5afc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 23:34:08 +00:00
Evgenii Stepanov
e497e7dfba Merge "Add armv9-a arch variant." 2023-03-07 22:58:10 +00:00
Jooyung Han
63975d73b1 Add dependency to /vendor/etc/linker.config.pb
The rule for the file should depend on vendor files. Otherwise, the rule
can be fired before installation of those stub libraries in /vendor/lib.

Bug: 244531518
Test: m (with a vendor lib with stubs)
Test: check /vendor/etc/linker.config.pb (should have the lib)
    $ conv_linker_config print -s $OUT/vendor/etc/linker.config.pb
Change-Id: If7a81e26a7a105234201b10cd58825c67a1d5967
2023-03-07 18:28:18 +09:00
Treehugger Robot
cf0325c0c0 Merge "Create vendor/etc/linker.config.pb with STUB_LIBRARIES" am: 8cd77dcec6
Original change: https://android-review.googlesource.com/c/platform/build/+/2470880

Change-Id: I0ba37422a26b7f3a51faee969eef14039690fe22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 19:11:54 +00:00
Evgenii Stepanov
3148fe365b Add armv9-a arch variant.
Bug: b/263283855
Test: none
Change-Id: I0e9fd48305ad1a26a708ecb2f0d3e7a07e14dbc8
2023-03-05 14:38:12 -08:00
Jooyung Han
8c119032f4 Create vendor/etc/linker.config.pb with STUB_LIBRARIES
system/etc/linker.config.pb is automatically populated with
STUB_LIBRARIES. We do the same for vendor/etc/linker.config.pb.

Bug: 244531518
Test: m vendorimage
Change-Id: If930ca07fcf7c6830b70a0332dae05365b90db12
2023-03-04 08:32:34 +09:00
Treehugger Robot
e26da42cf0 Merge "Can declare 1p without cycles." am: 04d5903f12
Original change: https://android-review.googlesource.com/c/platform/build/+/2464668

Change-Id: I29ff0ebc7918705924020ef196830709b685e7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 04:31:31 +00:00
Treehugger Robot
6e6fb8291f Merge changes I7266c0cc,I3caba054 am: c986b3ada3
Original change: https://android-review.googlesource.com/c/platform/build/+/2464633

Change-Id: I741ebdb2cb8f1f77e99e50d1026dbe507b0ff7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 23:53:52 +00:00
Treehugger Robot
b7ee2672ec Merge "BUILT_KERNEL_CONFIGS_FILE built by linux tools" am: 37600f4573
Original change: https://android-review.googlesource.com/c/platform/build/+/2464631

Change-Id: If539a9525ce219b9df192e6dba149db18bbbd67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 23:53:19 +00:00
Bob Badour
7aee59482b Can declare 1p without cycles.
Test: m droid dist
Change-Id: I044f1832db36d685628faed569f87491a6789591
2023-03-01 15:51:24 -08:00
Bob Badour
df0f55e526 Assert copyright on log contents.
Test: m droid dist
Change-Id: I7266c0cc7c1517482e3aa66f8c7df3a6fbe484fe
2023-03-01 10:34:34 -08:00
Bob Badour
1d31e2d776 Assert copyright on comments in file.
Test: m droid dist
Change-Id: I3caba054f44e1dcc9896fd4121c3d6a1a5139158
2023-03-01 10:31:25 -08:00
Bob Badour
7cc4e334ca BUILT_KERNEL_CONFIGS_FILE built by linux tools
Doesn't qualify as 0p. Use kernel license text.

Test: m droid dist
Change-Id: Ideb88128b3c0f250d4c978291a028b2952b73ba9
2023-03-01 10:16:04 -08:00
Cole Faust
a3763c18ef Don't install jni libs for uninstallable modules
Bug: 254205429
Test: Presubmits
Change-Id: I6739b71ce4a0141ad39d4b6046ae63c4c12e367d
2023-02-28 18:10:23 -08:00
Joe Onorato
a29a46050a Merge "Remove OWNERS access for non-build team people to core build system" am: 10bdfb5f23
Original change: https://android-review.googlesource.com/c/platform/build/+/2460830

Change-Id: I5e369235fae2ca61361873f95712dcb9d2d83570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:02:37 +00:00
Joe Onorato
10bdfb5f23 Merge "Remove OWNERS access for non-build team people to core build system" 2023-02-28 21:27:22 +00:00
Joe Onorato
682f36220b Remove OWNERS access for non-build team people to core build system
Test: treehugger
Change-Id: I578a2902b6d0853fffe4c3513322da4c15300513
2023-02-28 10:52:10 -08:00
Android Build Coastguard Worker
e5b3e8763a Version bump to TQ2A.230405.002 [core/build_id.mk]
Change-Id: Ib2ee903d092e5bc2db11107c4e6170f4450686bb
2023-02-27 23:29:11 +00:00
Erick Alvarez
e6ff3ed647 Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 37d0273275
Original change: https://android-review.googlesource.com/c/platform/build/+/2458952

Change-Id: I3f8601eab485d89375640e65afc1e0674feb9bfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 23:19:27 +00:00
Florian Mayer
45f02948a0 Merge "driveby: Fix typo" am: 2e39131d80
Original change: https://android-review.googlesource.com/c/platform/build/+/2449823

Change-Id: If2b3e5038bd72fc81bc77e278b17290b12e8ab18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 23:19:08 +00:00
Erick Alvarez
37d0273275 Merge "Revert "Disable dexpreopt for aosp_riscv64"" 2023-02-27 21:20:34 +00:00
Colin Cross
a1d6109978 Disable riscv64 dependency on bcc and ld.mc
riscv64 can't build the device version of bcc and ld.mc due to a
dependency on an old version of LLVM, but they are listed in
base_system.mk which can't add them conditionally based on the target
architecture.  Add a hack to base_system.mk to silence the warning
that the host-only modules are listed in PRODUCT_PACKAGES.  This
can be removed once renderscript is removed from the platform.

Test: lunch aosp_riscv64-userdebug && m
Change-Id: I8efd769a34b110dfb838f7016e029369cb9a0f01
2023-02-27 21:12:07 +00:00
Erick Alvarez
2b8cf0e409 Revert "Disable dexpreopt for aosp_riscv64"
This reverts commit e325f61525.

Reason for revert: DroidMonitor-triggered revert due to breakage in some branches.

Bug: 270958097
Change-Id: I2c3bb568c7f3b0dc7a364ea74b91574966102ff3
2023-02-27 20:39:14 +00:00
Florian Mayer
2e39131d80 Merge "driveby: Fix typo" 2023-02-27 19:36:39 +00:00
Ulya Trofimovich
18a94331ca Merge "Disable dexpreopt for aosp_riscv64" am: ee254eca0f
Original change: https://android-review.googlesource.com/c/platform/build/+/2450642

Change-Id: I8e96a2f0098577f1bcddadb413ed2f4fc2f33bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 12:15:00 +00:00
Florian Mayer
5e3f57c2d5 driveby: Fix typo
Change-Id: I3aa8a0bdd15d16975b8b630b03590457b8ac9326
2023-02-24 19:34:25 +00:00
Ulya Trafimovich
e325f61525 Disable dexpreopt for aosp_riscv64
dex2oat isn't supported for riscv64 yet, disable dexpreopt.  For
aosp_riscv64-user and -userdebug builds it is also necessary to
relax the requirement that dexpreopt is enabled.

Test: trehugger
Change-Id: Ib84f1b40675783d286f4ff89d3c1daa9c7be710a
2023-02-24 14:09:10 +00:00
Treehugger Robot
36b1360655 Merge "Add zip2zip to dependency of relevant binary targets" am: fddcbb03a1
Original change: https://android-review.googlesource.com/c/platform/build/+/2447682

Change-Id: Ia9fe8644d335faf13e40036166708ae58c89b337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 20:54:39 +00:00
Treehugger Robot
fddcbb03a1 Merge "Add zip2zip to dependency of relevant binary targets" 2023-02-22 19:46:32 +00:00
Kelvin Zhang
6d366d36e4 Add zip2zip to dependency of relevant binary targets
Bug: 269735619
Change-Id: I7eb3de066ec17cfcb072b4072997e3bafa83fbcd
2023-02-21 12:49:20 -08:00
Vincent Donnefort
07738c42b2 Merge "Fix missing dev nodes in init_boot.img ramdisk" am: 65af9993b3
Original change: https://android-review.googlesource.com/c/platform/build/+/2442241

Change-Id: Iace7a345a0ea5cfa19eb80d20179c2166bd89363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 10:33:49 +00:00
Vincent Donnefort
65af9993b3 Merge "Fix missing dev nodes in init_boot.img ramdisk" 2023-02-20 09:24:04 +00:00
Zhenhuang Wang
c14d68cebe Merge "Enable -sha256 feature to device-tests.zip" am: 195b5fc64c
Original change: https://android-review.googlesource.com/c/platform/build/+/2442621

Change-Id: Iea20ef137e33304479451116f8911cf3ec55735a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 08:03:32 +00:00
Vincent Donnefort
6e861e9cf8 Fix missing dev nodes in init_boot.img ramdisk
Previously ("Add null and console dev nodes to the Android initramfs")
introduced into init_boot.img the /dev/console and /dev/null nodes.
Sadly, it missed changing the release tools which are also generating
images in their own way.

Bug: 254835242
Change-Id: I4d2893ac24c09cf0d117422cbe2bde66083e7118
2023-02-17 10:52:28 +00:00
Zhenhuang Wang
d1dfcda616 Enable -sha256 feature to device-tests.zip
With `-sha256` flag, file header of generated zip files contains
SHA256 checksum for each file, which can then be used by downstream
systems.

Bug: 259513199
Test: m dist device-tests
Change-Id: Id5d2cba9096983da4f4843146a5eaa84393b4880
2023-02-17 17:48:24 +08:00
Treehugger Robot
287c48cda6 Merge "Rename otatools dependency from futility to futility-host" am: 272d090d39
Original change: https://android-review.googlesource.com/c/platform/build/+/2264495

Change-Id: I9f9a37e11c1c3c889ec1b295cabceb8de4102d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 08:12:44 +00:00
Treehugger Robot
272d090d39 Merge "Rename otatools dependency from futility to futility-host" 2023-02-16 07:39:05 +00:00
Zhenhuang Wang
963bc9676e Merge "Revert "Revert "Enable -sha256 feature to some Soong built zip files""" am: 371da61096
Original change: https://android-review.googlesource.com/c/platform/build/+/2434552

Change-Id: I8c9201b19e39bfa3455c1fd231d21cdfa174f5a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 03:10:39 +00:00
Zhenhuang Wang
371da61096 Merge "Revert "Revert "Enable -sha256 feature to some Soong built zip files""" 2023-02-16 02:10:40 +00:00
Aaron Kling
e380321735 Rename otatools dependency from futility to futility-host
The futility target for host is futility-host. This is required for
ryu out of tree signing.

Change-Id: I6c06ec69f991abc23597e19dd4478774cc4d56c4
2023-02-15 21:12:23 +00:00
Xin Li
27b4d0c71f Merge "Merge TQ2A.230305.008" into stage-aosp-master 2023-02-15 19:45:53 +00:00
Spandan Das
3c48d0938d Merge "Dist api_fingerprint file for droidcore" am: d3e1b41c33
Original change: https://android-review.googlesource.com/c/platform/build/+/2435767

Change-Id: Iaa2c36fc11d69793ec0a7a455191a3846ec400e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 18:48:55 +00:00
Kelvin Zhang
f0a1afdd56 Merge "Copy all files from BOARD_SYSTEM_DLKM_SRC" am: 8ffc90d4e9
Original change: https://android-review.googlesource.com/c/platform/build/+/2435770

Change-Id: Ia538767800ec15b648b21ea84c215b28ccfa8ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 18:47:30 +00:00
Spandan Das
d3e1b41c33 Merge "Dist api_fingerprint file for droidcore" 2023-02-15 18:06:27 +00:00
Kelvin Zhang
8ffc90d4e9 Merge "Copy all files from BOARD_SYSTEM_DLKM_SRC" 2023-02-15 18:03:02 +00:00
Kelvin Zhang
19961b53c4 Copy all files from BOARD_SYSTEM_DLKM_SRC
BOARD_SYSTEM_DLKM_SRC might contain files such as modules.dep. These
files also need to be copied, so relax the globbing pattern to copy all
files under BOARD_SYSTEM_DLKM_SRC.

Test: th
Bug: 267014648
Change-Id: I1fef8f8d7fe01fd4bd99d62981c108d95ef47bfe
2023-02-14 18:23:28 -08:00
Xin Li
95bbef8402 Merge TQ2A.230305.008
Bug: 264720040
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
Change-Id: I0cf59fc2635e8d951da0bbeced842f92c3d5b655
2023-02-14 16:13:00 -08:00
Yike Zhang
af6394b6e7 Merge "Export test config info to module-info while the module is uninstallable" am: 249865de52
Original change: https://android-review.googlesource.com/c/platform/build/+/2434932

Change-Id: I40a388305ce29b73c2fe8de71ba6d119554398ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 23:48:45 +00:00
Spandan Das
10cd857c3f Dist api_fingerprint file for droidcore
Currently it only gets disted for `sdk`

Bug: 266791853
Test: m dist droidcore, and checked out/dist/api_fingerprint.txt
Change-Id: I098c3890d7290a5f0094fea056cbc8bf1684df11
2023-02-14 21:26:55 +00:00
Yike
40f5c3a1fe Export test config info to module-info while the module is uninstallable
All Robolectric tests are set as uninstallable modules, which skips the
logic exporting `test_config` and `auto_test_config` to module-info.
But downstream infra needs this information to determine if a module is
a test module. So that this change moves the logic that sets
`test_config` and `auto_test_config` for Robolectric tests out of the
snippet specifically for installable module.

Test: m out/target/product/coral/module-info.json
Bug: 268670243
Change-Id: Icf4caf3d6833f3a39927fb69c6fb76762b8f6f14
2023-02-15 03:18:28 +08:00
Android Build Coastguard Worker
1c10406fe4 Make change and version bump to TQ2A.230405.001
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21359524'] into tm-qpr2-release.

Change-Id: Ie61ad93088e05ba456ce67b568edefd4260ab189
2023-02-14 18:21:39 +00:00
Steve Berbary
b1bdb64c74 Update Security String to 2023-04-05
Bug: 268558932
Change-Id: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
(cherry picked from commit c29c047fd1)
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
2023-02-14 18:15:34 +00:00
Zhenhuang Wang
23d8c72472 Revert "Revert "Enable -sha256 feature to some Soong built zip files""
This reverts commit 7d8eeec0dd.

Reason for revert: re-submit the change https://r.android.com/2393272

Change-Id: I6c906a82823a4b69d0cd8a5ce364d802c646cb68
2023-02-14 00:29:30 +00:00
Android Build Coastguard Worker
5ca47f57b1 Version bump to TQ2A.230305.008 [core/build_id.mk]
Change-Id: I20a857714f506097c06cf8168b7ec368a3117612
2023-02-11 17:28:31 +00:00
Treehugger Robot
6dd3de71fc Merge "Support BOARD_SYSTEM_DLKM_SRC build config" am: fa7113c696
Original change: https://android-review.googlesource.com/c/platform/build/+/2411433

Change-Id: I68642f18887195be07f4c66f53cf8bdeda39d051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 10:11:57 +00:00
Treehugger Robot
fa7113c696 Merge "Support BOARD_SYSTEM_DLKM_SRC build config" 2023-02-11 09:25:04 +00:00
Kelvin Zhang
0dbfd70963 Support BOARD_SYSTEM_DLKM_SRC build config
In aosp/2323114 , BOARD_SYSTEM_DLKM_SRC is removed in favor of
BOARD_SYSTEM_KERNEL_MODULES . However, BOARD_SYSTEM_DLKM_SRC preserves
directory structure of input kernel modules, where as
BOARD_SYSTEM_KERNEL_MODULES flattens everything by copying all modules
into the same directory. This causes some issues as vendor_dlkm that
depend on system_dlkm modules now need to update their modules.dep file
due to changes in path. For backward compatibility, add support
for BOARD_SYSTEM_DLKM_SRC .

When both BOARD_SYSTEM_DLKM_SRC and BOARD_SYSTEM_KERNEL_MODULES are
set, BOARD_SYSTEM_KERNEL_MODULES will be preferred. The priority is arbitrary,
but we need a defined ordering to prevent double copying.

Test: th
Bug: 267014648
Change-Id: Ib2f5229af02ea2b7c0d96da70afed9118f484c97
2023-02-10 21:06:53 -08:00
Zhenhuang Wang
97e73564c3 Merge "Revert "Enable -sha256 feature to some Soong built zip files"" am: 65ff0460c4
Original change: https://android-review.googlesource.com/c/platform/build/+/2430432

Change-Id: I947c01778145669c5cb36d3645f1cd6d43988674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 14:46:18 +00:00
Zhenhuang Wang
65ff0460c4 Merge "Revert "Enable -sha256 feature to some Soong built zip files"" 2023-02-10 14:11:49 +00:00
Zhenhuang Wang
7d8eeec0dd Revert "Enable -sha256 feature to some Soong built zip files"
This reverts commit fae06b15ce.

Reason for revert: Some labs are still not upgraded to the latest version, causing presubmit test flaky.

Bug: 268608699
Bug: 259513199
Change-Id: I05f0fef27afdbbd5350e77616074059b7bf1da42
2023-02-10 14:02:06 +00:00
Zhenhuang Wang
5c8213b1bd Merge "Enable -sha256 feature to some Soong built zip files" am: 9544346d39
Original change: https://android-review.googlesource.com/c/platform/build/+/2393272

Change-Id: I151922ca28ec3f876298898c9a1ab00b55666f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 08:28:24 +00:00
Zhenhuang Wang
9544346d39 Merge "Enable -sha256 feature to some Soong built zip files" 2023-02-10 08:00:44 +00:00
Jiakai Zhang
ae60455886 Merge "Revert "Don't disable dexpreopt for an unbundled build."" am: 9964bf51e5
Original change: https://android-review.googlesource.com/c/platform/build/+/2428694

Change-Id: If189521931a7dd959f260ef1408799550bb54c51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 14:42:57 +00:00
Jiakai Zhang
9964bf51e5 Merge "Revert "Don't disable dexpreopt for an unbundled build."" 2023-02-09 14:01:59 +00:00
Jiakai Zhang
60c08f24a7 Revert "Don't disable dexpreopt for an unbundled build."
This reverts commit d5d8904e52.

Reason for revert: Maybe broke the build on git_stage-aosp-master on mainline_modules_x86_64-userdebug

Change-Id: Ia33a642abda127b43aa6e265deb43dca7ee04f34
2023-02-09 12:56:59 +00:00
Treehugger Robot
f8149c5688 Merge "Migrate to the new clang lib dir" am: 99014b038c
Original change: https://android-review.googlesource.com/c/platform/build/+/2428752

Change-Id: I87a3b04cad809bb5f8eb7d4fd6f08ef34d304530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 11:32:01 +00:00
Yi Kong
e4b8f48a6d Migrate to the new clang lib dir
Test: presubmit
Change-Id: Ib409725d540d285dfd840bcd3de33020218f3bc0
2023-02-09 15:17:04 +09:00
Jiakai Zhang
8f1a701b8f Merge "Don't disable dexpreopt for an unbundled build." am: 0a3f6a2bb5
Original change: https://android-review.googlesource.com/c/platform/build/+/2425454

Change-Id: Ib352612a51574c623334cd670d7762125469fe90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 18:16:35 +00:00
Jiakai Zhang
0a3f6a2bb5 Merge "Don't disable dexpreopt for an unbundled build." 2023-02-08 17:39:51 +00:00
Treehugger Robot
a154b87205 Merge "Merge TQ1A.230205.002" 2023-02-08 10:40:37 +00:00
Treehugger Robot
288f5ca642 Merge "Use the init_boot partition name with avb for prebuilt" am: 5683ef1934
Original change: https://android-review.googlesource.com/c/platform/build/+/2422906

Change-Id: I56de457de93fcc36ecab79390c6b4ad908c643eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 02:08:43 +00:00
Treehugger Robot
5683ef1934 Merge "Use the init_boot partition name with avb for prebuilt" 2023-02-08 01:38:11 +00:00
Treehugger Robot
780964e41b Merge "Make words() work on a list of non-strings" am: 6086c5ce5f
Original change: https://android-review.googlesource.com/c/platform/build/+/2424056

Change-Id: I74650b2b2d7800d509f2fb558a242df8664b1377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 01:25:10 +00:00
Treehugger Robot
6086c5ce5f Merge "Make words() work on a list of non-strings" 2023-02-08 00:52:24 +00:00
Cole Faust
2b5b3f3be8 Make words() work on a list of non-strings
words() attempts to join all the elements of a list
and then resplit them to more closely match make.
But sometimes, like when calling words() on a product
variable, not all of the elements are strings. In
that case, just return the list unchanged.

Bug: 267407943
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I738d0c86c8935f446807cc79623f796e8cae3c01
2023-02-07 12:28:47 -08:00
Jiakai Zhang
d5d8904e52 Don't disable dexpreopt for an unbundled build.
Dexpreopt generates profiles that need to be installed in the APEX.
Soong will skip the dex2oat step after it generates the build rule for
profiles.

Bug: 241823638
Test: -
  1. Patch ag/20581649 PS2.
  2. banchan com.android.btservices x86_64 && m
  3. Check that "javalib/service-bluetooth.jar.prof" exists in the APEX.
Change-Id: I5cad1b0e1027935fd78e80ad7b07e039f7b8d432
2023-02-08 03:47:24 +08:00
Xin Li
fc740c9920 Merge TQ1A.230205.002
Bug: 263898609
Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
Change-Id: I6c6ce54d95ea5b44d4907a710e36f2fcd80991a6
2023-02-06 21:07:34 -08:00
Devin Moore
77ae07dc5b Use the init_boot partition name with avb for prebuilt
When building a target with a prebuilt init_boot image, we still need to
use the correct name for the image.

Test: m
Bug: 268050089
Change-Id: I8fd11d8c17c2c140b7cff1dd8255c8b8728ea196
2023-02-06 17:25:06 +00:00
Android Build Coastguard Worker
f159d350f6 Version bump to TQ2A.230305.007 [core/build_id.mk]
Change-Id: Iec89798bdc3314925f92cc0e47d31ce32b11adb8
2023-02-04 03:50:22 +00:00
Android Build Coastguard Worker
d4baf72ab6 Version bump to TQ2A.230305.006 [core/build_id.mk]
Change-Id: Ie60b11a927007ad9571eda1f6b094fb68d275d81
2023-02-02 21:52:30 +00:00
Jared Duke
9976b4bbe6 Merge "Further refine VisibleForTesting rules" am: 7e559f9c24
Original change: https://android-review.googlesource.com/c/platform/build/+/2415814

Change-Id: Id681d9ac8b5566f56e820216bffe75a4491e3776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 20:54:27 +00:00
Jared Duke
7e559f9c24 Merge "Further refine VisibleForTesting rules" 2023-02-02 16:34:49 +00:00
Jared Duke
da0d73e580 Further refine VisibleForTesting rules
Additional analysis revealed more edge cases where external library
code was getting kept unnecessarily. Further refine the keep rules to
avoid these cases. Now, we only apply keep globally for the
`com.android.internal.annotations.VisibleForTesting` annotation.

VisibleForTesting annotations defined externally (e.g., by androidx or
guava) will *only* be respected in platform-defined packages. This
helps trim unused code from deps like gRPC and Dagger, saving up to
~hundreds of KB per package that uses these libraries.

Bug: 248580093
Test: m + verify exclusion of external test code (e.g., from dagger)
Change-Id: Iab7559c08d3ae1ac74f18e3cf3a1b4828a3736cf
2023-02-02 16:33:34 +00:00
Sam Delmerico
1fce1d0d1e Merge "Revert "remove unneeded dontwarn settings"" am: 7f6fc715ba
Original change: https://android-review.googlesource.com/c/platform/build/+/2412692

Change-Id: Ic924e106dd68e55607324f43607bda54dd0b7089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 16:45:01 +00:00
Sam Delmerico
7f6fc715ba Merge "Revert "remove unneeded dontwarn settings"" 2023-02-01 16:01:32 +00:00
Sam Delmerico
4731ab7282 Revert "remove unneeded dontwarn settings"
This reverts commit 59570d1e64.

Reason for revert: we still need these flags

Change-Id: I8caa6350f0b62e6aa2a190e128d5ce7d8f849ea8
2023-01-31 20:14:18 +00:00
Eran Messeri
6d2a5f431c Merge "AOSP: Added new properties for attestation" am: 1f5aa11437
Original change: https://android-review.googlesource.com/c/platform/build/+/2237054

Change-Id: Ie43c9b857d3456992d16956369c00ef7a88b9850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 16:59:07 +00:00
Eran Messeri
1f5aa11437 Merge "AOSP: Added new properties for attestation" 2023-01-31 13:43:55 +00:00
Android Build Coastguard Worker
4e953c95a1 Version bump to TQ2A.230305.005 [core/build_id.mk]
Change-Id: I3236c2fbd10722113998510857e94c0ce0e28e08
2023-01-28 02:57:33 +00:00
Treehugger Robot
a16bae6627 Merge "Add support for packaging modules.load.recovery into vendor_kernel_boot" am: 43cbca31e6
Original change: https://android-review.googlesource.com/c/platform/build/+/2403126

Change-Id: Idc3e93781f7f349a68e62b762aee8c397e5184a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 23:43:10 +00:00
Treehugger Robot
43cbca31e6 Merge "Add support for packaging modules.load.recovery into vendor_kernel_boot" 2023-01-27 22:55:58 +00:00
Dennis Shen
80c8a4d1ac Merge "Set soong config variable TrimmedApex" am: ef83ce6a79
Original change: https://android-review.googlesource.com/c/platform/build/+/2384472

Change-Id: I5617875e10fcefd7955cea3789033d1f08555d32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 20:22:09 +00:00
Shikha Panwar
1d1902941b Merge "Include initrd_bootconfig in the list of OTA tools" am: 44eccdd471
Original change: https://android-review.googlesource.com/c/platform/build/+/2387652

Change-Id: I14a532bf92c2a4a6288eadce2de0805b22ce0c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 20:21:24 +00:00
Android Build Coastguard Worker
fa6e951a7d Version bump to TQ2A.230305.004 [core/build_id.mk]
Change-Id: I17ee94c0986c461684e7f987552878bd05876912
2023-01-27 18:39:50 +00:00
Dennis Shen
ef83ce6a79 Merge "Set soong config variable TrimmedApex" 2023-01-27 13:11:50 +00:00
Shikha Panwar
44eccdd471 Merge "Include initrd_bootconfig in the list of OTA tools" 2023-01-27 12:11:10 +00:00
Vincent Donnefort
03130d98e4 Merge "Add null and console dev nodes to the Android initramfs" am: 6133aea40f
Original change: https://android-review.googlesource.com/c/platform/build/+/2368008

Change-Id: I8f706fe07bc3dcbc00753f52612aae1304d2d569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-26 09:50:49 +00:00
Vincent Donnefort
6133aea40f Merge "Add null and console dev nodes to the Android initramfs" 2023-01-26 09:04:33 +00:00
Zhenhuang Wang
fae06b15ce Enable -sha256 feature to some Soong built zip files
Enable the new soong_zip feature to general-tests.zip,
host-unit-tests.zip, android-cts.zip, android-mts.zip etc. This is a
following change of https://r.android.com/2395452. With `-sha256` flag,
file header of generated zip files contains SHA256 checksum for each
file, which can then be used by downstream systems.

Bug: 259513199
Test: run `m dist host-unit-tests general-tests cts mts` and check zip
    files under `out/dist/`
Change-Id: I726b5261d177beadcd8f707e2cd2cb5cdef20273
2023-01-26 13:49:57 +08:00
Isaac J. Manjarres
3a7fe9184b Add support for packaging modules.load.recovery into vendor_kernel_boot
Add support for creating a modules.load.recovery file in the
vendor_kernel_boot image when
BOARD_VENDOR_KERNEL_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD is specified.

Bug: 266752750
Change-Id: I430b785c13dca84949da5032e05025385168df07
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
2023-01-25 17:33:18 -08:00
Treehugger Robot
b261e8a219 Merge "Fix remote execution of r8 and d8 in make" am: e9c253fe31
Original change: https://android-review.googlesource.com/c/platform/build/+/2393217

Change-Id: Ib6a04b65932db48d34b3079a1b1a2e38aef585fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 23:24:49 +00:00
Treehugger Robot
e9c253fe31 Merge "Fix remote execution of r8 and d8 in make" 2023-01-25 23:13:07 +00:00
Treehugger Robot
e3942c7222 Merge "Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make" am: 13556c40c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2402512

Change-Id: Iba0b314bbe07804be31346a52e23d217b81b918c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 20:29:33 +00:00
Treehugger Robot
13556c40c3 Merge "Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make" 2023-01-25 19:07:48 +00:00
Sam Delmerico
f2cadbe1c4 Merge "remove unneeded dontwarn settings" am: 738531af25
Original change: https://android-review.googlesource.com/c/platform/build/+/2378047

Change-Id: I8c168de699d75980a6de0763b1dfbf8d26490da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 16:29:27 +00:00
zijunzhao
deaf24812d Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make
Bug: b/261642850
Test: Build and check warnings. Add two xfail tests in art and see the
results locally.

Change-Id: I122ee2cbfa37bdb71026781efe6cb7131b873ae0
2023-01-25 04:06:34 +00:00
Dennis Shen
c320615931 Set soong config variable TrimmedApex
BUG: b/259381334
TEST: adbd banchan build with setting on and off
Change-Id: I67220735f3a6cb35a8a8676b58e433d97223e428
2023-01-24 20:04:03 +00:00
Sam Delmerico
59570d1e64 remove unneeded dontwarn settings
Some of these -dontwarn settings were added because r8 did not have access to transitive dependencies. Now these dependencies are passed as -libraryjars we can remove some of the -dontwarns.

Test: TARGET_BUILD_VARIANT=userdebug MODULE_BUILD_FROM_SOURCE=true \
  UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true \
  packages/modules/common/build/mainline_modules_arm64.sh -j120
Bug: 242088131
Change-Id: I408a8f3ac9d11c1bd6608f2a18fd2291db8c9275
2023-01-24 11:52:42 -05:00
Prashant Patil
7d9cda1883 AOSP: Added new properties for attestation
Added new properties, which could be set for AOSP/GSI builds.
These properties are going to be used for attestation feature through
Build.java class. Earlier in AOSP builds attestation ids were different
from provisioned ids in Keymint. These properties will be identical to
provisioned ids.

Bug: 110779648
Bug: 259376922
Test: atest VtsAidlKeyMintTargetTest:PerInstance/NewKeyGenerationTest#EcdsaAttestationIdTags/0_android_hardware_security_keymint_IKeyMintDevice_default
Test: atest VtsAidlKeyMintTargetTest:PerInstance/NewKeyGenerationTest#EcdsaAttestationIdTags/1_android_hardware_security_keymint_IKeyMintDevice_strongbox
Test: atest CtsKeystoreTestCases:android.keystore.cts.KeyAttestationTest CtsKeystoreTestCases:DeviceOwnerKeyManagementTest

Change-Id: I9eea5e0f2fabc667b3efedeeefdf12e7b4fc9502
2023-01-24 16:47:54 +00:00
Android Build Coastguard Worker
e273869df5 Version bump to TQ2A.230305.003 [core/build_id.mk]
Change-Id: I250dd2cde623479cef4cb773ed3e578f18136c99
2023-01-24 01:32:12 +00:00
Treehugger Robot
918c4d3947 Merge "Fix dependency issues for vbmeta.img target" am: 84db323873
Original change: https://android-review.googlesource.com/c/platform/build/+/2399154

Change-Id: I19ebf6d410d6aed2db2f64fdcc724a3af7b21630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-23 23:56:14 +00:00
Kelvin Zhang
0841b9076b Fix dependency issues for vbmeta.img target
Extra space in variable names causes dependencies for
INSTALLED_VBMETAIMAGE_TARGET to be missing. Remove extraneous sspaces.

Bug: 263568805
Test: lunch cuttlefish,  m distclean, m, and check
$OUT/vbmeta_vendor_dlkm.img

Change-Id: If818a8af42c407a7213f58a7142dffb9dee1fd16
2023-01-23 11:12:26 -08:00
Android Build Coastguard Worker
f966be7773 Version bump to TQ2A.230305.002 [core/build_id.mk]
Change-Id: I8ec25a672e24ed7098572fb063b9463a850e8ef3
2023-01-20 00:42:39 +00:00
Treehugger Robot
3740d039e1 Merge "Package blkid_static in otatools" am: de15310cc0
Original change: https://android-review.googlesource.com/c/platform/build/+/2395612

Change-Id: I0364ba75649b2c46f08c0a8d76a34ec1419cc739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 22:56:59 +00:00
Baligh Uddin
9170e897d0 Package blkid_static in otatools
BUG: 264426585
Test: TH
Change-Id: Ie34719e98619d18dc35add80595eddd867eaf38f
2023-01-19 18:20:55 +00:00
Benjamin Peterson
099349bea8 Fix remote execution of r8 and d8 in make
1. The location of the r8.jar and d8.jar files was no longer correct.
2. $(JAVA) was not defined before rbe.mk was included.
3. $(JAVA) includes options, which much be stripped to be a rewrapper toolchain input.

Test: ran against an RBE cluster with RBE_D8_EXEC_STRATEGY=remote and RBE_R8_EXEC_STRATEGY=remote

Change-Id: Icf434f5c0fda687c70c75b01b0bfd63bcd8cc474
2023-01-19 18:17:08 +00:00
Treehugger Robot
621e9cc599 Merge "Fix generic ramdisk build failures on dedicated recovery partitions" am: 2797146c86
Original change: https://android-review.googlesource.com/c/platform/build/+/2388833

Change-Id: Ia3fff9e16c204c846c1600c9cdcb83dc39bac027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 20:24:56 +00:00
Treehugger Robot
2797146c86 Merge "Fix generic ramdisk build failures on dedicated recovery partitions" 2023-01-18 19:25:57 +00:00
Treehugger Robot
71ca6b2e7a Merge "Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS" am: 854afb6673
Original change: https://android-review.googlesource.com/c/platform/build/+/2391477

Change-Id: I18847369e33509c73cb58e51db3e9f018434a7c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 18:36:22 +00:00
Treehugger Robot
854afb6673 Merge "Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS" 2023-01-18 18:07:07 +00:00
Treehugger Robot
a7d2cc7d0a Merge "Resubmit: Initial add wvts to build" am: e473190d52
Original change: https://android-review.googlesource.com/c/platform/build/+/2383292

Change-Id: I794fcf36ccf04291e51030dd16f947068c97fc8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 01:00:12 +00:00
Treehugger Robot
e473190d52 Merge "Resubmit: Initial add wvts to build" 2023-01-18 00:17:45 +00:00
Cole Faust
bd5eab8477 Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS
No longer used.

Bug: 262629589
Test: m nothing
Change-Id: I3d9acf9fc3e205588161c9fb50fbe757f764d6bb
2023-01-17 15:38:33 -08:00
Android Build Coastguard Worker
b0a35c98fd Make change and version bump to TQ2A.230305.001
Merge cherrypicks of ['ag/20984664'] into tm-qpr2-release.

Change-Id: I2807ebe0b2cfad46f65d587ab520b225726c40ac
2023-01-17 20:21:33 +00:00
Steve Berbary
d7834084dd Update Security String to 2023-03-05
Bug: 265319238
Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
(cherry picked from commit 465700df39)
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
2023-01-17 20:07:54 +00:00
Kelvin Zhang
1143aaf772 Fix generic ramdisk build failures on dedicated recovery partitions
For targets with BoardUsesRecoveryAsBoot set to true, binaries in
generic_ramdisk are installed to $OUT/recovery/root/first_stage_ramdisk
This path is not on generic_ramdisk.mk 's allowlist, hence build fails.
To fix the failure, add $OUT/recovery/root/first_stage_ramdisk/system to
allow list.

Test: th, lunch eos-userdebug(a dedicated recovery partition target) and build.

Bug: 265477065
Change-Id: I89cf229adc028a7e5de632b9a3188ecb411de735
2023-01-17 17:11:55 +00:00
Treehugger Robot
b63987d351 Merge "Allow vendors to add custom vbmeta partitions" am: b80d9d6c33
Original change: https://android-review.googlesource.com/c/platform/build/+/2380861

Change-Id: Id38f4980039b9cefb9c0f3f5f215588ae59867b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 00:55:01 +00:00
Treehugger Robot
b80d9d6c33 Merge "Allow vendors to add custom vbmeta partitions" 2023-01-14 00:23:02 +00:00
Shikha Panwar
d3bef475b2 Include initrd_bootconfig in the list of OTA tools
initrd_bootconfig is required for signing the virt apex & hence needs to
run outside the source tree as well.

Test: NA
Bug: 245277660
Change-Id: Id1776661e76a75cfb3cf530e7777dc4292522dd0
2023-01-13 08:28:44 +00:00
Xin Li
3e266be1a6 Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master 2023-01-13 07:32:57 +00:00
Android Build Coastguard Worker
c6a1548da9 Version bump to TQ2A.230109.003 [core/build_id.mk]
Change-Id: I97a46c5295638f06ef9001d0021b6ad3287eaca7
2023-01-13 03:02:59 +00:00
Kelvin Zhang
b81b4e3621 Allow vendors to add custom vbmeta partitions
Currently we only have vbmeta_system and vbmeta_vendor. Add
BOARD_AVB_VBMETA_CUSTOM_PARTITIONS , which allows OEMs to define
their own vbmeta_*.img partitions. example: aosp/2381823

Bug: 263568805
Change-Id: Id671e2c3aee9ada90256381cce432927df03169b
2023-01-12 17:34:42 -08:00
Vincent Donnefort
4a5fd836a1 Add null and console dev nodes to the Android initramfs
/dev/null is a security requirement for bionic, /dev/console is needed
so the kernel can set-up stdout stderr and stdin before running /init.

Bug: 254835242
Change-Id: I865856885e9957ea17e28b62273e701af9bfc56f
2023-01-12 11:25:14 +00:00
Xin Li
d8cc7f97ad Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
Bug: 264720040
Merged-In: Iea5b6fffed7c27855d87e35292f07a56686e4197
Change-Id: I912db6aac23dc5ee37b8b4455eec553da31d6dbc
2023-01-11 22:54:26 -08:00
Jooyung Han
8ee63e4ee8 Merge "vendor/etc/linker.config.pb from multiple input files" 2023-01-12 06:46:39 +00:00
Android Build Coastguard Worker
686a6957d5 Version bump to TQ2A.230109.002 [core/build_id.mk]
Change-Id: Ief26fe17debe7e51ad095d1783733a55ca858015
2023-01-11 20:52:22 +00:00
Robert Shih
1b73bfbd97 Resubmit: Initial add wvts to build
[ Merge of pa/2264578 ]

Test: make wvts

Bug: 209663123
Change-Id: If1382ed06a93bc34d327ee88bf46ff290e84f786
2023-01-11 00:55:50 +00:00
Dan Sinkiewicz
e61203da9c Merge "Revert "Initial add wvts to build"" 2023-01-10 18:56:57 +00:00
Robert Shih
57fe3f6041 Revert "Initial add wvts to build"
This reverts commit 588f2e62da.

Reason for revert: b/265032293

Change-Id: I6a9dd24cfef2256288170f5bf59d24604f05d4d2
2023-01-10 18:51:18 +00:00
Robert Shih
0f8236bb24 Merge "Initial add wvts to build" 2023-01-10 18:27:26 +00:00
Jooyung Han
da2d4a29bf vendor/etc/linker.config.pb from multiple input files
When we have dedicated .mk files for each modules (e.g. usb, drm, etc)
and those modules have their own linker configuration requirements, it
would make more sense to have "fragments" for linker configuration.

This change introduces a new list variable to store the list of linker
configuration fragments. When it's set, vendor/etc/linker.config.pb is
generated from the list of input fragments.

Bug: 264330513
Test: set PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS
Test: m vendorimage (generates vendor/etc/linker.config.pb)
Change-Id: I9eed0f90add0191885b7195efdab94b5b1a4a62d
2023-01-10 11:57:23 +09:00
Android Build Coastguard Worker
390c2376d4 Version bump to TQ1A.230205.002 [core/build_id.mk]
Change-Id: If255da6baf0a179cf7fde3f69b34346c64d178d6
2023-01-10 00:11:25 +00:00
Cole Faust
5065c690dd Merge "Remove duplicates from VendorVars maps" 2023-01-09 22:50:04 +00:00
Android Build Coastguard Worker
4fb411f032 Make change and version bump to TQ2A.230109.001
Snap for 9467077 from 623ac18616 to tm-qpr2-release

Change-Id: Icb582cddf02cac7b529b0b552447a286516f1ca8
2023-01-08 23:04:38 +00:00
Robert Shih
588f2e62da Initial add wvts to build
[ Merge of pa/2264578 ]

Test: make wvts

Bug: 209663123
Change-Id: I089fcdfc385e9d01aa275f77a566ffecb5340495
2023-01-08 03:38:11 +00:00
Android Build Coastguard Worker
5b59878322 Make change and version bump to TQ2A.230108.001
Snap for 9465878 from 623ac18616 to tm-qpr2-release

Change-Id: Ie5f1e2fa8df7a47d62102562b8e846bf4948ada3
2023-01-07 23:08:44 +00:00
Android Build Coastguard Worker
02d66c0e4d Make change and version bump to TQ2A.230107.001
Snap for 9463735 from 623ac18616 to tm-qpr2-release

Change-Id: Iec1e0aeced1820b0b1241e5c19d5bed240aba262
2023-01-07 02:59:43 +00:00