Commit graph

9352 commits

Author SHA1 Message Date
Chirayu Desai
390c3a63af
Don't set PRODUCT_ENABLE_UFFD_GC by default
* Overriding this from devices doesn't work
* Using ?= here doesn't work either
* It still defaults to "default" based on other places
  and works the same, so let's just remove this

Change-Id: Ie9d732796a46770c11a7608e7c0990653d59fbd0
2024-10-24 19:31:52 +02:00
Michael Bestas
99ea7632bb
Remove non existent health 2.0 recovery package
Health 2.0 targets have been removed in change
I8e1eb743d978315ae9b5b516d3e2e9dc6151d2c2

Test: m, observe "includes non-existent modules in PRODUCT_PACKAGES"
      error is no longer present.
Change-Id: Idd910dfe7028cf0f39e11451a256807c24063061
2024-10-24 19:31:52 +02:00
Chirayu Desai
a26124d361
Revert "Add DeviceDiagnostics.apk"
This reverts commit 3cff79686f.

Reason: Not present in AOSP

Change-Id: If4a812327bc44d1fba880726b601971cc946147d
2024-10-24 19:31:52 +02:00
Aaron Kling
2fa06c1c39
Disable Traceur for non eng-builds
Change-Id: I9cc1d747dc70bcf89486009f7ecae1628ccfc0aa
2024-10-24 19:28:26 +02:00
LuK1337
e7ee416ff9
Unset BOARD_EXT4_SHARE_DUP_BLOCKS
* This allows us to remount ext4 partitions read-write
  on devices with dynamic partitions.

This reverts the following commits:

Revert "Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk"

This reverts commit I0eb035ba6edf44719d5de4f09fd97b5783537597.

Revert "enable BOARD_EXT4_SHARE_DUP_BLOCKS for generic_arm64"

This reverts commit 125b6d6eea.

Change-Id: I3768374d6da59f969ea44c1965f75c934edf3b57
2024-10-24 19:27:38 +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
David Anderson
6e8103751d Revert "Remove non existent snapuserd.recovery package"
This reverts commit 48a8f59607.

Reason for revert: b/349287459
(cherry picked from https://android-review.googlesource.com/q/commit:b3f0337ae62af7b2ce66acaabdf5d8d874d16bb4)
Merged-In: I5835cc025b37efca4d6294abf4aefd7148ddfd65
Change-Id: I5835cc025b37efca4d6294abf4aefd7148ddfd65
2024-07-09 02:32:11 +00:00
Justin Yun
c5ad2eabdc Replace PRODUCT_COPY_FILES with soong module
Include android.software.credentials.prebuilt.xml prebuilt_etc module
instead of using PRODUCT_COPY_FILES.

Bug: 345373198
Test: See if android.software.credentials.xml is installed in
      system/etc/permissions
(cherry picked from https://android-review.googlesource.com/q/commit:c5f7f80416eb9231416dfec03e8d497ceb43c4df)
Merged-In: Ia5519d1650b994f380aa4e31042139af999e49a7
Change-Id: Ia5519d1650b994f380aa4e31042139af999e49a7
2024-07-04 03:07:31 +00:00
Reema Bajwa
331dd69ae9 Enable Credential Manager for all handheld devices
Bug: 345373198
Test: Cts
(cherry picked from https://android-review.googlesource.com/q/commit:cc589fada57c9d4d449ffff4b8a5d6ad7fb2ed51)
Merged-In: I54ec933aaacef5c313dada751cd68d303a7cb0b7
Change-Id: I54ec933aaacef5c313dada751cd68d303a7cb0b7
2024-07-03 04:19:33 +00:00
Treehugger Robot
459fe75055 Merge "Set widevine apex signed with dev key" into main am: 683eb4b502 am: 5a648e50c9
Original change: https://android-review.googlesource.com/c/platform/build/+/3101237

Change-Id: I08eca6771fba7f14892609b5df21d72108979d1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:17:43 +00:00
Treehugger Robot
5a648e50c9 Merge "Set widevine apex signed with dev key" into main am: 683eb4b502
Original change: https://android-review.googlesource.com/c/platform/build/+/3101237

Change-Id: I58b8a290fcbcda4ff8e3cc478ba2e3d0328f35f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:04:03 +00:00
Treehugger Robot
683eb4b502 Merge "Set widevine apex signed with dev key" into main 2024-06-11 22:46:44 +00:00
Kyle Zhang
cc21bf8b29 Set widevine apex signed with dev key
Bug: 341134913
Change-Id: Ied39e2a1dd4b715afc2ee4d35c18b52eabfc417f
2024-06-11 21:45:34 +00:00
Treehugger Robot
9a3900c7e9 Merge "Enable Pre-reboot Dexopt at build time." into main am: bfcac4a398 am: f8180be2bf
Original change: https://android-review.googlesource.com/c/platform/build/+/3121991

Change-Id: I74afaeea9535b05a33ff4b75ca1b09ab14ca4881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-10 16:53:29 +00:00
Treehugger Robot
f8180be2bf Merge "Enable Pre-reboot Dexopt at build time." into main am: bfcac4a398
Original change: https://android-review.googlesource.com/c/platform/build/+/3121991

Change-Id: I7181149aeb5beda5a8290df959e0d313cabb9b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-10 16:36:08 +00:00
Jiakai Zhang
28618cfff8 Enable Pre-reboot Dexopt at build time.
Bug: 311377497
Test: m
Change-Id: I48933eadea8be1d81e7c4ce37abb5a2175402236
2024-06-10 15:11:07 +01:00
Treehugger Robot
b4cf9be5fb Merge "Build build_flags.json in soong" into main am: 04837c61f3 am: 4401accfe0
Original change: https://android-review.googlesource.com/c/platform/build/+/3011233

Change-Id: I6e32f3b30d749b092f71ab6fd6bcc736605cca2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 05:50:40 +00:00
Treehugger Robot
4401accfe0 Merge "Build build_flags.json in soong" into main am: 04837c61f3
Original change: https://android-review.googlesource.com/c/platform/build/+/3011233

Change-Id: Ia33e4242d757bf6be4158039d5f88147ec7d99b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 05:31:15 +00:00
Treehugger Robot
04837c61f3 Merge "Build build_flags.json in soong" into main 2024-06-07 05:12:31 +00:00
Xin Li
67d97cd71e Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
Bug: 343100748
Merged-In: I02e87e92878770cf21fb5032efb75eb1b222c62f
Change-Id: I2f8cb71a54227b97ab83eb7966b2f4c04724f2d2
2024-06-05 14:07:19 -07:00
Cole Faust
06f09f1e32 Merge "Remove all VNDK deprecation flags" into main am: b20aee1b1e am: 154682ce06
Original change: https://android-review.googlesource.com/c/platform/build/+/3109757

Change-Id: Ibcdb54782077930162b8d7d0481f57f8863dedee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 20:01:02 +00:00
Cole Faust
154682ce06 Merge "Remove all VNDK deprecation flags" into main am: b20aee1b1e
Original change: https://android-review.googlesource.com/c/platform/build/+/3109757

Change-Id: I6eb9b5aeff8293dddc9dc2d1941ad98a0f123532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 19:36:28 +00:00
Cole Faust
b20aee1b1e Merge "Remove all VNDK deprecation flags" into main 2024-06-05 19:24:17 +00:00
Spandan Das
07609e780a Override map for enabling Go mainline module prebuilts
The release config maps in `v/g_sh/b/r/gms_mainline_go/required`
will be used to enable Go mainline prebuilts of mandatory modules by
both internal google products and partner OEMs.

Addition of `v/g_sh/b/r/gms_mainline_go/optional` is product dependent, and
will have to be added separately

Bug: 342265627
Test: lunch mokey_go32-ap3a-userdebug
Test: verified that the following vars are same before and after change
Test: get_build_var RELEASE_APEX_CONTRIBUTIONS_ADBD # go prebuilt
Test: get_build_var RELEASE_APEX_CONTRIBUTIONS_REMOTEKEYPROVISIONING #
go prebuilt
Test: get_build_var RELEASE_APEX_CONTRIBUTIONS_UWB # go prebuilt
Ignore-AOSP-First: part of a topic

Change-Id: Ib80c4eef669dcfc3eaf8bb8dc5b9eb011d335fd0
2024-06-03 19:07:31 +00:00
Steven Moreland
343a1c90ea Merge "Android builds default to 64-bit." into main am: 48c53d600e am: 066ad556ab
Original change: https://android-review.googlesource.com/c/platform/build/+/3109067

Change-Id: I3357273d9954511175bcd5ae5bfd9257230934b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 18:43:58 +00:00
Steven Moreland
066ad556ab Merge "Android builds default to 64-bit." into main am: 48c53d600e
Original change: https://android-review.googlesource.com/c/platform/build/+/3109067

Change-Id: I69fb3c0342d84e5eac60e03ddce22ab350f23f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 18:37:07 +00:00
Steven Moreland
48c53d600e Merge "Android builds default to 64-bit." into main 2024-06-03 18:32:26 +00:00
Treehugger Robot
df8589e6b6 Merge "Override map for enabling mainline module prebuilts" into main am: 08445aada2 am: c284f8c8d2
Original change: https://android-review.googlesource.com/c/platform/build/+/3109349

Change-Id: Ie740a8039108aa04051af68188bf323e2ef9a851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-01 02:33:14 +00:00
Treehugger Robot
c284f8c8d2 Merge "Override map for enabling mainline module prebuilts" into main am: 08445aada2
Original change: https://android-review.googlesource.com/c/platform/build/+/3109349

Change-Id: I738f2e2367db36b4b1cef35dca8aa734288ca3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-01 02:25:17 +00:00
Spandan Das
c3ff9f4beb Override map for enabling mainline module prebuilts
The release config maps in `v/g_sh/b/r/gms_mainline/required`
to enable mainline prebuilts of mandatory modules by
both internal google products and partner OEMs.

Addition of `v/g_sh/b/r/gms_mainline/optional` is product dependent, and
will have to be added separately

Bug: 342265627
Test: lunch cf_x86_64_phone-ap3a-userdebug
Test: verified that the following vars are same before and after change
Test: get_build_var RELEASE_APEX_CONTRIBUTIONS_ADBD # prebuilt
Test: get_build_var RELEASE_APEX_CONTRIBUTIONS_REMOTEKEYPROVISIONING #
prebuilt
Test: get_build_var RELEASE_APEX_CONTRIBUTIONS_UWB # prebuilt

Test: lunch cf_x86_64_wear-ap3a-userdebug && get_build_var
RELEASE_APEX_CONTRIBUTION_ADBD # empty string

Change-Id: Id7f0f97aa3ea11d4ab5b818349cb7905e3e79b29
2024-06-01 00:05:22 +00:00
Steven Moreland
c89cf9628b Android builds default to 64-bit.
Some people don't specify what they build. This came up on
some host tools target, and there were some interactions.
Anyway, 64-bit is in, 32-bit is out. Cheers.

Bug: N/A
Test: N/A
Change-Id: I69ab62d88011df90874e4ba05ee34b61805911e0
2024-05-31 20:23:16 +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
Treehugger Robot
350375ef02 Merge "Add a release config map override for go devices" into main am: 8a402d7e30 am: 59761b9ce6
Original change: https://android-review.googlesource.com/c/platform/build/+/3107061

Change-Id: Ic4c65c60a83d8ade18d9352a0d1d3d83539151ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:37:36 +00:00
Cole Faust
e34e931599 Merge "Add instructions to generate java keystore" into main am: 31e9d3d1b2 am: 19dae885ab
Original change: https://android-review.googlesource.com/c/platform/build/+/3104279

Change-Id: I3c6a4a36fa8b0d32ba0b6df8299517c6ecc3029e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:15:55 +00:00
Treehugger Robot
59761b9ce6 Merge "Add a release config map override for go devices" into main am: 8a402d7e30
Original change: https://android-review.googlesource.com/c/platform/build/+/3107061

Change-Id: Ic7c990088c1706fd7eef4535510e15c14f8ad1e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 23:13:19 +00:00
Treehugger Robot
8a402d7e30 Merge "Add a release config map override for go devices" into main 2024-05-28 22:53:34 +00:00
Spandan Das
fa22579c4d Add a release config map override for go devices
This is a followup to https://r.android.com/3069967 and moves the
override map to v/google_shared/build/release. This allows sharing of
build flags between internal and partner builds.

Bug: 342265627
Test: presubmits
Test: verified that this map shows up in `get_build_var
PRODUCT_RELEASE_CONFIG_MAPS` of a go device

Change-Id: I1cb874a27cd3029a47a4634598420fb5b218ce7d
2024-05-28 21:12:10 +00:00
Cole Faust
19dae885ab Merge "Add instructions to generate java keystore" into main am: 31e9d3d1b2
Original change: https://android-review.googlesource.com/c/platform/build/+/3104279

Change-Id: I4d8f3b5ffb70c6eb707717884f9ebf440924ba61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 20:41:11 +00:00
Daniel Zhang
b46b840e18 Add instructions to generate java keystore
copied from commit message packages/inputmethods/LatinIME c884b6631f5d13637167f6bc66bbb81e6a00bd8f

Change-Id: Ie3d48041004930ca5e62c442778eb915fb99d257
Signed-off-by: Daniel Zhang <danielzhang130@gmail.com>
Test: none
2024-05-27 01:30:15 +00:00
Xin Li
2389748ddb Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future 2024-05-24 21:16:16 +00:00
Gaurav Sarode
c20424ed15 Merge "Fix Automotive GSI RRO configuration" into main am: bdb6b87837 am: c5d1727048
Original change: https://android-review.googlesource.com/c/platform/build/+/3098638

Change-Id: I952e1761c897f00e1bf380f449917a9a33ff7132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 19:46:31 +00:00
Gaurav Sarode
bdb6b87837 Merge "Fix Automotive GSI RRO configuration" into main 2024-05-24 19:15:13 +00:00
Xin Li
b04e9cc36f Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I713a528d437e3446d32461add648e3b52b036d7a
Change-Id: I7fdd415a218d1425f7fc37095d02c674ddfae6eb
2024-05-24 08:30:06 -07:00
Gaurav Sarode
b25c2dfc61 Fix Automotive GSI RRO configuration
Skipping config based RRO for automotive GSI builds

bug: 323238313
Test: local build
Change-Id: Ie2b6c5e10633cbd2c60b98738ee0676a49a7d21e
2024-05-23 22:49:49 +00:00
Vilas Bhat
6fb4c8f827 Merge "ndk: Remove MALLOC_LOW_MEMORY config for the ndk" into main am: 995902c2e5 am: 3fc7f82463
Original change: https://android-review.googlesource.com/c/platform/build/+/3097566

Change-Id: Id1e687fc2d971b839d51061cc5f4f287504129b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 19:10:47 +00:00
Vilas Bhat
d98e1a86f3 ndk: Remove MALLOC_LOW_MEMORY config for the ndk
This switches the ndk to using scudo instead of jemalloc.

Bug: 337242400
Test:
Built NDK and tested lldb-server on both 4k and 16k devices
```
$ cd aosp && mkdir ndk_prebuilts
$ export OUT_DIR=ndk_prebuilts
$ ./build/soong/scripts/build-ndk-prebuilts.sh
$ cp -r ~/aosp/ndk_prebuilts/soong/ndk/sysroot/*
~/llvm-project/toolchain/prebuilts/ndk/releases/r27/toolchains/llvm/prebuilt/linux-x86_64/sysroot/
$ cd ../llvm-project
$ python3 toolchain/llvm_android/build.py
$ adb push out/stage2-install/runtimes_ndk_cxx/aarch64/lldb-server /data/local/tmp/
$ adb shell "getconf PAGE_SIZE"
16384
$ adb shell "strace /data/local/tmp/lldb-server"
<output trimmed>
mprotect(<address redacted>, 16384, PROT_READ) = 0
exit_group(0)                           = ?
+++ exited with 0 +++
```
Change-Id: I982595278d70cb39b9f6c7c8e9b95f12723fc5bf
2024-05-23 18:43:57 +00:00
Justin Yun
0949453dd2 Build build_flags.json in soong
Move the make build rule for build_flags.json to soong.

Bug: 324996303
Test: m --no-skip-soong-tests
Change-Id: I958d5bb78db1d63b6145ac6a498490faa2fea315
2024-05-23 15:08:51 +09:00
Treehugger Robot
d049f5bb7d Merge "Remove no-op config." into main am: cfceeceb3a am: d589c0bd29
Original change: https://android-review.googlesource.com/c/platform/build/+/3097721

Change-Id: Id8b7f0734f2067133250688095f09383e3557f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 22:32:29 +00:00
Dan Albert
e35bb7c9b3 Remove no-op config.
This was copied over from when Soong required us to define it in the
properties file, but this is the default and we also don't care.

Bug: None
Test: None
Change-Id: I35311093c83fddcb7c413535fbb50a126b615036
2024-05-22 20:49:53 +00:00
Treehugger Robot
87bcb41080 Merge "16k: build: Enable PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO on the ndk target" into main am: 5b0dfe41b8 am: 4fddfbc8d8
Original change: https://android-review.googlesource.com/c/platform/build/+/3092184

Change-Id: I1f20f6fcc174461048dd06ff0e3ad071f66b21e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 19:30:08 +00:00