Commit graph

1722 commits

Author SHA1 Message Date
Cole Faust
a83dd3bc49
Add soong_config_set_bool
To allow typing soong config variables as bools for using in soong
select expressions.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I39496cd2a3366689e3f232ba10353a7d56d8d1ed
2024-10-24 19:31:52 +02:00
Luca Stefani
a47c7368d7
build: Add tequila build support
Squashed also with the following changes:

  Author: Luca Stefani <luca020400@lineageos.org>
  Date:   Thu Aug 17 22:22:13 2017 +0200

    core: Include Lineage pathmap

  Change-Id: Ie25dee383cc5bc9bb6390cff2cb2460d526d80b6

  Author: Simon Shields <simon@lineageos.org>
  Date:   Fri Mar 2 12:55:47 2018 +1100

    build: unconditionally use lineage pathmap

    even if we're not building a lineage target, we need to
    use the lineage pathmap to make things like recovery and ril
    happy

  Change-Id: I974c30ad10d4ff5b7805c3df9c22010f1e002bf1

  Author: Luca Stefani <luca.stefani.ge1@gmail.com>
  Date:   Tue Jan 22 15:50:52 2019 +0100

    Don't export BUILD_NUMBER in envsetup

    * The value is meant to be set only before running an /official/ build
    * This allows us to execute consecutive make commands without
      running kati for every invocation

  Change-Id: Ifa94b839f30c7260009c8a3c91c202b50e28022e

  Author: Luca Stefani <luca020400@lineageos.org>
  Date:   Fri Aug 18 10:17:00 2017 +0200

    envsetup: Call fixup_common_out_dir

  Change-Id: I84e16b0df5822cfd8514c46d709109a13c20f86e

  Author: Adrian DC <radian.dc@gmail.com>
  Date:   Sat May 12 11:24:33 2018 +0200

    build: Include LineageOS specific properties in build.prop

     * Our properties were supposed to go to /system/etc/prop.default
        after the following commit:
        "lineage: Move to Google's method of defining system default props"
        Change-Id: I6cb0e28a7599b010b389cc541015a37010a00f4b

     * However if BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED is not true,
        only /default.prop will retain the properties contents of
        ADDITIONAL_DEFAULT_PROPERTIES and PRODUCT_SYSTEM_DEFAULT_PROPERTIES,
        and none of our versioning identification was held in the system

     * Enabling BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED globally would
        break all properties on devices that handle partitions usually
        at the device level rather than the kernel due to mounting races

     * Include the vendor/lineage/config/main.mk entrypoint to be allowed
        to extend ADDITION_BUILD_PROPERTIES as we need to define our releases

  Change-Id: I19918eece0f0dd3ee967db0339b4d09c9a6d540e
  Signed-off-by: Adrian DC <radian.dc@gmail.com>

  Author: Rashed Abdel-Tawab <rashed@linux.com>
  Date:   Thu Sep 5 21:35:38 2019 -0700

    core: Only include Lineage SE policy if repo exists

  Change-Id: If799106d2da6d8c303430e316edff365a22f7c99

  Author: dianlujitao <dianlujitao@lineageos.org>
  Date:   Thu Sep 5 21:56:36 2019 +0800

    product: Exclude AOSP apn list on Lineage build

    Change-Id: I1fd10089421a2e4b57ef565d87ad1f6036bd1898

  Author: Michael Bestas <mkbestas@lineageos.org>
  Date:   Fri Apr 12 02:10:12 2019 +0300

    build: Conditionally include AudioPackage14.mk instead of AllAudio.mk

    * AllAudio.mk doesn't contain latest material files and also
      contains multiple duplicate files. Just copy the latest
      material ones and we'll include the older files in vendor/lineage

    Change-Id: Ic7353216a3f3dc3c51006d951ac932cfd6e5f3b5

  Author: dhacker29 <dhackerdvm@gmail.com>
  Date:   Sat Jun 6 22:22:05 2015 -0400

    Remove LatinIME as it is included per target in vendor/lineage

    Change-Id: Ibce4a244ec0653a7c7798d864047ac667866a1dc

  Author: razorloves <razorloves@gmail.com>
  Date:   Mon Oct 7 05:10:56 2019 -0500

    build: Remove su inclusion

    This stops including su in all lineage userdebug/eng builds.
    Inclusion of su is conditionally handled in /vendor/lineage.

    Change-Id: Ia3ad978146f170a2b260d77afe9eb580d4b4f823

  Author: Michael Bestas <mkbestas@lineageos.org>
  Date:   Sat Nov 7 22:45:12 2020 +0200

    Stop including vendor specific clear_vars.mk

    vendor/lineage/build/core/clear_vars.mk is no-op since 16.0

    Change-Id: I7e159cc9ed5a838c9a04c1a8b7dcf925d83f0e20

Change-Id: Iab8b2ef8b644a7bea10bfd28b99d9e69539b1357
2024-10-24 19:25:10 +02:00
Lance Chang
7c282854f3 Change TARGET_BUILD_APPS_WITH_BUILD_NUMBER to a product variable
This change allows unbundled app builds to embed the build number in the
version name by defining PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER, so that
APK files from a build can be easily identified.

Ignore-AOSP-First: changes in topics with internal-only projects
Test: manual build
Bug: 340311907
Change-Id: If7feda5eec2bc1e54a90b4adae1bd6da19e3ea45
2024-06-10 22:27:42 -07:00
Lance Chang
eda8686794 Add build number if TARGET_BUILD_APPS_WITH_BUILD_NUMBER is defined
This change allows unbundled app builds to embed the build number in the
version name by defining TARGET_BUILD_APPS_WITH_BUILD_NUMBER, so that
APK files from a build can be easily identified.

Ignore-AOSP-First: changes in topics with internal-only projects
Test: manual build
Bug: 340311907
Change-Id: I9a7e4f96f0d92c19d832933b5c68bd6b75ce9ce6
2024-06-09 13:22:58 -07:00
Cole Faust
b20aee1b1e Merge "Remove all VNDK deprecation flags" into main 2024-06-05 19:24:17 +00:00
Steven Moreland
52c2371ae8 Reland "check_elf_file: check prebuilts are aligned"
This reverts commit 411fb17537.

Reason for revert: reland after other targets are fixed b/342466032

Bug: 342466032
Test: build, w/ and w/o checking enabled

Change-Id: I830166faffec781cf6cc4fea47140a60b0a12466
2024-06-04 17:26:12 +00:00
Kiyoung Kim
69f5dbb0d0 Remove all VNDK deprecation flags
VNDK is fully deprecated, so flags to deprecate VNDK is no longer
needed. This change removes all flags deprecates VNDK.

Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: Ifc918a875d7d5bed232165873ee9b0c562841594
2024-05-31 09:52:18 +09:00
Inseob Kim
85b83a90e1 Move sysprop assignments to separate mk file
core/sysprop_config.mk is added to separate code setting
ADDITIONAL_*_PROPERTIES variables. This should be a no-op for now but it
will help migrate build.prop generation to Soong.

Bug: 322090587
Test: compare build.prop files before and after
Change-Id: I57a1ae899865027bcadddc2071fcd2afcf2703bc
2024-05-09 17:38:46 +09:00
Kousik Kumar
fe9aaa23fe Remove deprecated Goma makefiles
Goma is no longer used with android platform builds. Just a minor cleanup.

Bug: n/a
Change-Id: I62844c1d555677006a1022dab4f12bcfd7e55758
2024-05-01 18:14:17 +00:00
Jim Tang
b9cc101bca Deprecate USE_PREBUILT_SDK_TOOLS_IN_PLACE
USE_PREBUILT_SDK_TOOLS_IN_PLACE is not set anywhere else after
aosp/3043552 lands.

Bug: 122333025
Bug: 332464939
Test: m
Change-Id: I55490cdc0a7036263876ecbb322cc5b4af8d1959
2024-04-18 14:12:15 +08:00
Vilas Bhat
f44951d3af 16k: build: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets
This relands commit 35839ec1a3 and also
includes `PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO` override for several
targets. The latter is required in order to fix failing tests due to
mismatch in the `VSR_VENDOR_API_LEVEL` value between test and device
targets.

Bug: 333124272
Bug: 310232825
Change-Id: I12db4b78b02aa4a58c7355852dc2ff5ae395592c
2024-04-15 21:45:08 +00:00
Vilas Bhat
15e3467d6d Revert^3 "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"
This reverts commit 35839ec1a3.

Reason for revert: CI breakages for 2 targets. Please refer to bug for more details

Bug: 334152807
Change-Id: I0e38583cd3fa57afef432406374ec8d4ddc57e72
2024-04-12 22:20:40 +00:00
Vilas Bhat
d3123d4f62 16k: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO only on Android V targets
This updates the VSR_VENDOR_API_LEVEL for which
TARGET_NO_BIONIC_PAGE_SIZE_MACRO is set to false from < 34 to < 35

Bug: 310232825
Test: lunch <target> && get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Change-Id: Ib6b8ba94fe6b2c8b7bbf31fb56e07bd97eb79fc2
2024-04-12 17:23:57 +00:00
Vilas Bhat
35839ec1a3 Revert^2 "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"
This reverts commit 5c2956897c.

Reason for revert: Fixed the breaking tests on `aosp_cf_x86_64` target.

Change-Id: I7179b4615985f4f85b26ebe5ce099ee4899bb415
Test: lunch <target> && get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Bug: 310232825
2024-04-11 21:34:08 +00:00
Weilin Wu
5c2956897c Revert "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"
This reverts commit 9014163717.

Reason for revert: DroidMonitor: Potential culprit for Bug 332223093 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Icc3617d8c80f2417e22205b7305583bfaef64913
2024-04-01 07:01:36 +00:00
Vilas Bhat
9014163717 16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets
Enabling TARGET_NO_BIONIC_PAGE_SIZE_MACRO implies those targets no
longer rely on the `PAGE_SIZE` bionic macro. Page size would be queried
at runtime using getpagesize() / sysconf(_SC_PAGE_SIZE).

Test: lunch <target> && get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Bug: 310232825
Change-Id: I01291c8626d103a4f3bbc0a659d5843a78a9b24b
2024-03-29 17:50:40 +00:00
Vilas Bhat
d3ad962cdc 16k: core: Remove page size limitation for setting TARGET_NO_BIONIC_PAGE_SIZE_MACRO
TARGET_NO_BIONIC_PAGE_SIZE_MACRO could be enabled regardless of the
value specified by TARGET_MAX_PAGE_SIZE_SUPPORTED and hence, the check
is no longer required.

Test: lunch <target> && get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Bug: 310232825

Change-Id: I4da314b803c4d84ac4ac1da691b9c195c2f2fb1d
2024-03-26 15:49:39 +00:00
Vilas Bhat
d4e6add5b0 16k: core: Add defaults for TARGET_MAX_PAGE_SIZE_SUPPORTED
This refactors existing validation logic to do the following:
- Default ELF alignment to 4096 for non-(arm64/x86_64) targets.
- Default ELF alignment to 4096 if VSR_VENDOR_API_LEVEL < 34.

Test: lunch <target> && get_build_var TARGET_MAX_PAGE_SIZE_SUPPORTED
Bug: 310232825
Change-Id: Ia1548d74c9f92b70a80cb65cc6ed35d4c77edcd2
2024-03-25 18:11:39 +00:00
Vilas Bhat
8c85199efe 16k: core: Change default TARGET_MAX_PAGE_SIZE_SUPPORTED to 16384
Changing TARGET_MAX_PAGE_SIZE_SUPPORTED default from 65536 to 16384 as
this would reduce the ELF alignment for files and thereby also
decreasing the padding required. Although increased padding does not
result in increased disk space (due to holes), it increases file
metadata. Reducing ELF alignment also helps reduce page table memory as
it reduces number of memory pages utilized / virtual memory address
mappings.

Test: lunch <target> && get_build_var TARGET_MAX_PAGE_SIZE_SUPPORTED
Bug: 310232825
Change-Id: I7c6b1bb699fec8b8ecf49a0f06a79d89142e3a2b
2024-03-22 20:45:45 +00:00
Cole Faust
d49454acab Remove BPTTOOL variable
This is unused since aosp/2654584

Test: Presubmits
Change-Id: Idf9b17d4d3b59f5a19ff544dd95d740892743303
2024-03-20 18:05:54 -07:00
Treehugger Robot
4e5aa5d0f5 Merge "Remove fs_get_stats." into main 2024-03-14 17:13:26 +00:00
Elliott Hughes
b904c27e12 Remove fs_get_stats.
This was only used by the tarball-building support that was removed
in 2019.

Test: treehugger
Change-Id: I719364699d426d21010c3ab913d12f15128f2538
2024-03-14 15:32:24 +00:00
Inseob Kim
51193b144c Add 202404 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 327954176
Test: m selinux_policy
Change-Id: Ic2d628785e8fb2882d16a1920115b6b925d2d4a1
2024-03-11 16:19:33 +09:00
Treehugger Robot
d8c04fd026 Merge "Move setting default BOARD_VNDK_VERSION value" into main am: 9b3d6f91aa
Original change: https://android-review.googlesource.com/c/platform/build/+/2960351

Change-Id: I066fb29a388a0311fc9170dbe10a1c810deef71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 13:57:49 +00:00
Inseob Kim
31051a565d Merge "Revert^2 "Use vFRC version as-is for ToT sepolicy version"" into main am: 5fd1645f11
Original change: https://android-review.googlesource.com/c/platform/build/+/2960347

Change-Id: Id99bd029aac84e6fa3c0790bec0488787f19787d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 13:55:25 +00:00
Kiyoung Kim
09aaa26c06 Move setting default BOARD_VNDK_VERSION value
Current BOARD_VNDK_VERSION is being set from config.mk, but this is
before build system loads release config and checks if VNDK is
deprecated or not. Move this to envsetup so it can set up
BOARD_VNDK_VERSION only when VNDK is not deprecated with flag.

Bug: 324976878
Test: mainline release target build succeeded

Change-Id: I490cc431038f5cebc40d03c98d2666eaba906664
2024-02-13 13:40:40 +09:00
Inseob Kim
5fd1645f11 Merge "Revert^2 "Use vFRC version as-is for ToT sepolicy version"" into main 2024-02-13 04:02:36 +00:00
Inseob Kim
4e72d5e4da Revert^2 "Use vFRC version as-is for ToT sepolicy version"
fb3a97fc7d

Change-Id: I13612dee1ebc6aabbd3bc46fb4c30568dc23a6da
2024-02-13 02:20:00 +00:00
Kiyoung Kim
f74c3b5fe8 Merge "Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION" into main am: 1d952f82a5
Original change: https://android-review.googlesource.com/c/platform/build/+/2949648

Change-Id: I3b47559ad8182f8c8c04e345c8ef18bcc90c459a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 01:24:47 +00:00
Ikjoon Jang
6e9bd101e8 Merge "Revert "Use vFRC version as-is for ToT sepolicy version"" into main am: 96b16f654d
Original change: https://android-review.googlesource.com/c/platform/build/+/2954994

Change-Id: If24356b1d7244ef9a76578dbdd9ea7b9f89d12d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08 04:50:47 +00:00
Ikjoon Jang
fb3a97fc7d Revert "Use vFRC version as-is for ToT sepolicy version"
Revert submission 2952245-vfrc_as_tot_sepolicy

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_main&target=mainline_modules_arm64-mainline-userdebug&lkgb=11421838&lkbb=11421957&fkbb=11421841, b/324335916

Reverted changes: /q/submissionid:2952245-vfrc_as_tot_sepolicy

Bug: 324335916
Change-Id: I573db8b1a7f7874e146eea1135594eb0f1b6658f
2024-02-08 02:53:55 +00:00
Inseob Kim
bff91ad0d1 Merge "Use vFRC version as-is for ToT sepolicy version" into main am: b9835251d1
Original change: https://android-review.googlesource.com/c/platform/build/+/2911567

Change-Id: I8fe81865d57796f806b00b06420b3c153ef685b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08 01:22:38 +00:00
Kiyoung Kim
1e14cdfd56 Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION
Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION if VNDK is
deprecated. BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION should not be
used once VNDK is deprecated with KEEP_VNDK=false

Bug: 316829758
Test: AOSP CF build succeeded
Change-Id: Iead60663bed3653e63e7a444a873cfaea50780b0
2024-02-07 21:07:23 +09:00
Inseob Kim
5653f37337 Use vFRC version as-is for ToT sepolicy version
Minor version hasn't been used. As we are moving to a new versioning
scheme, removing the minor version and using vFRC version as-is to align
with other vendor interfaces.

Bug: 314010177
Test: build and boot
Change-Id: I138c13c798a15cbb52c45cbad68e5a65cb1d0888
2024-02-06 03:56:49 +00:00
Xin Li
e693b5037e Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I21eb7d5dc8cef9c1dd797ba1ab2ee830a8a5a42b
Change-Id: I42210485ad8f07e19408bef0e5a2af23f6a0e596
2024-01-30 10:33:42 -08:00
Treehugger Robot
bc32e2d878 Merge "Bump Java target from 1.7 to 1.8 in makefiles" into main 2024-01-26 17:44:00 +00:00
Sorin Basca
d35691dabe Bump Java target from 1.7 to 1.8 in makefiles
Bug: 320294595
Test: m
Change-Id: I66f3ebf2d6979a8b033c2f475fa21bae26ca97cd
2024-01-26 16:44:33 +00:00
Justin Yun
b33308c88c Use RELEASE_BOARD_API_LEVEL_FROZEN
RELEASE_BOARD_API_LEVEL_FROZEN must not be overriden by a board
config value. Use RELEASE_BOARD_API_LEVEL_FROZEN directly to build
configs.

Bug: 295269182
Test: TH
Change-Id: I60ad4cf1a9f377619fef98d6f9ef4d04d3395991
2024-01-22 10:54:06 +09:00
Jiyong Park
0284ba297c Set BOARD_SYSTEMSDK_VERSIONS even if PRODUCT_SHIPPING_API_LEVEL is unset
Previously, we checked if PRODUCT_SHIPPING_API_LEVEL >= 28, but that no
longer is needed because upgrading from 29 to 35 is not expected. All
devices running Android V are expected to be shipped after 28.

Furthermore, this fixes non-device targets (like sdk) where
PRODUCT_SHIPPING_API_LEVEL is unset.

Bug: 318634417
Test: build with sdk target
Change-Id: I8f8337fb76312334777e621ae5870d953167ad49
2024-01-04 21:14:58 +09:00
Steven Moreland
fb1160d0b8 PRODUCT_FULL_TREBLE disabled warning
Treble is like so 2016, but it's 2023.

Bug: 307369186
Test: build
Change-Id: Icb24e218d0dbc5f76f0c83f809728d33dc67719e
2023-12-28 21:39:10 +00:00
Steven Moreland
6b5b3b40bd Merge "Force PRODUCT_NOTICE_SPLIT." into main 2023-12-27 18:40:17 +00:00
Steven Moreland
5c11308f60 Force PRODUCT_NOTICE_SPLIT.
Bug: 307369186
Test: N/A
Change-Id: I9d7810422cd8c34e84d755cfc14aded633a5baad
2023-12-27 01:09:36 +00:00
Inseob Kim
771b893d0f Change sepolicy version format for vFRC
sepolicy versioning is for system <-> vendor compatibility. This changes
sepolicy version format from sdk version (e.g. 34.0) to vendor api
version (e.g. 202404.0).

Bug: 314010177
Test: build and boot
Change-Id: Ic15e07e7422be203dae08670bf58328669c9f474
2023-12-13 09:20:12 +00:00
Vilas Bhat
9843c389a2 Merge changes from topic "update-no-bionic-page-size" into main am: f28fa571d0 am: e8c4ae9094 am: 98ca0096e6
Original change: https://android-review.googlesource.com/c/platform/build/+/2859825

Change-Id: I0f5d348efdc7c24e4294440d782b413a65b1f922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 15:29:33 +00:00
Vilas Bhat
01e2b98ca8 16k: core: Update PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO
This is to help clarify that this flag doesn't mean the device
will actually work end-to-end with any page size. Renaming
several dependent variables will be done in subsequent patches.

Bug: 312541564
Test:
```
 $ source build/envsetup.sh
 $ lunch aosp_cf_arm64_phone_pgagnostic-trunk-userdebug
 $ get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
 true
```
Change-Id: I9bae8b00139f601a3324da902aeb4ae82113ccdd
2023-12-05 21:59:31 +00:00
Yi-Yo Chiang
24c9ebadb9 Merge "Deprecate BOARD_GKI_SIGNING_* vars and build rules" into main am: 3afaac28b9 am: 3637989aa1 am: cde8985c82
Original change: https://android-review.googlesource.com/c/platform/build/+/2846155

Change-Id: I93d2a5147110d5a6364fc9f2f3f4b276b3b474b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 04:10:27 +00:00
Yi-Yo Chiang
3afaac28b9 Merge "Deprecate BOARD_GKI_SIGNING_* vars and build rules" into main 2023-11-29 03:04:59 +00:00
Timothy Yiu
970bf093cd Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main 2023-11-28 05:41:32 +00:00
Yi-Yo Chiang
d6f568f587 Deprecate BOARD_GKI_SIGNING_* vars and build rules
These were for building and signing GKIs in the platform tree.
We are no longer building GKIs this way, so remove these dead build
rules.

Bug: 229701033
Test: presubmit
Change-Id: I0b807de1407988489e994ec5a0da282616ac1af1
2023-11-28 09:31:47 +08:00
tyiu
bbaa5efbbc Add config for FULL_SYSTEM_OPTIMIZE_JAVA
FULL_SYSTEM_OPTIMIZE_JAVA allows device to enable full system java
optimization.

Bug: 300514883
Test: local m
Change-Id: Iba0a546ef2b721b929b791c6a9e6c854e9bec909
Merged-In: Iba0a546ef2b721b929b791c6a9e6c854e9bec909
2023-11-27 19:29:31 +00:00