Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2676296



Change-Id: I0a8f7ec33034a0eb3711c7dd817103234b0895ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3061702



Change-Id: Ie6c09bab2757fbbfcca41bcd54d98afce01ea23d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Also remove mattcarp.

Change-Id: I9c9fd727042a6863f54a31883196dbdd9035dcf4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3056423



Change-Id: I55303548d547f6f38abc44d429f39f431a57699c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

https://r.android.com/3035972 delegates dexpreopt of the sdk_library to
its implementation library by creating the apex variant of the
implementation library module. Therefore, the apex variants need to be
added to the allowed_deps.txt entries.

No-Allowed-Deps-Check: build changes
Test: m
Bug: 332785297
Merged-In: I48e02f254129abbe41e07f25684fde2af0949089
Change-Id: I48e02f254129abbe41e07f25684fde2af0949089

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3040593



Change-Id: I4d992eedab84e915c188813aed5ae16183e34b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug: 328444881
Test: m
Change-Id: I6861838c626a995c70ee43e2037e6dc105b2ff1a
Apex-Size-Increase: 0 until dependencies are used; analysis forthcoming in b/336579781
Previous-Platform-Support: yes
Aosp-First: yes
Test-Info: tests exist for each independent dependency

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3029109



Change-Id: I9701ab46a375178e13d6f6831eff0d4c0c1fe065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3029109



Change-Id: I09c296a514381ece83493c0e70e871f05f4c6f3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

We're trying to build Android system image which is defined in
Android.bp. It's cumbersome to set visibility for every apex module. So
define an aggregated module for mainline modules.

Bug: 321000103
Test: m nothing
Change-Id: I3fb278feaa015ecbe3bb3a38440561533af8ad46
Merged-In: I3fb278feaa015ecbe3bb3a38440561533af8ad46

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3048072



Change-Id: I9c2441842cd3c9a0241accbea442d274240eec92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

framework-permission-s is currently being depended by the following
modules:
- test_com.android.permission

android.net.ipsec.ike is currently being depended by the following
modules:
- com.android.ipsec
- test_com.android.ipsec

No-Allowed-Deps-Check: Preexisting dependencies
Test: m
Merged-In: I19c529b2fe030664037a4534d8609a04a49014e8
Change-Id: I7f8c5ae7b9ae054652b1463c3e90aa46206e4c01

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3047613



Change-Id: If570daa1d0492114572ceb1e257797e65fa4020a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Apex-Size-Increase: 37 kb
Previous-Platform-Support: No
Aosp-First: external dependency
Ignore-AOSP-First: Need update AndroidX in main first to avoid conflict
Test-Info: existing presubmit tests

Bug: 322508920
Test: presubmit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:96b72f65d7cf85f6978db2798b05f5bebae31866)
Merged-In: I03e459b3521b55c8f1cfe94c9fb7618d485c44b5
Change-Id: I03e459b3521b55c8f1cfe94c9fb7618d485c44b5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3023363



Change-Id: Idde33e6c0b6584c695374f7109d35e58f2b5b898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug: 331409973
Test: N/A
No-Allowed-Deps-Check: no-op refactor
Merged-In: I456b8f26a56f391c33f69233e86fdc13184811e7
Change-Id: I456b8f26a56f391c33f69233e86fdc13184811e7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3034652



Change-Id: Id6e43f812270b0271b7a2a1a551b9b2929132e6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

This suggested change is automatically generated based on group
memberships and affiliations.
If this change is unnecessary or in error, vote CR -1 and the bot
will abandon it. Vote CR +1/2 to approve this change.

See the owner's recent activity for context:
https://android-review.googlesource.com/q/hsnali@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: I2b2eaad1c75b8256c540af4dc7c95dafc9bb401e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3031485



Change-Id: Ic88a7d3b77df939bf9c38ebbef91d07353895be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Aosp-First: No
Change-Id: Ia5d77ca35dfb9d5a9f17d46c4fb086b586cdacbd
Merged-In: Ia5d77ca35dfb9d5a9f17d46c4fb086b586cdacbd
Apex-Size-Increase:
Previous-Platform-Support: yes
Test-Info:Android JUnit Test
ignore-AOSP-First: Merge conflict resolution
Test: NA

Apex-Size-Increase: 1468 KiB for com.google.android.art.apex
Previous-Platform-Support: yes, the prebuilts work on API 30 and up
Aosp-First: AOSP-first (but really github.com/llvm/llvm-project)
Test-Info: upstream lit-based test suite, run automatically in upstream
  CI and manually with local Android devices

Test: m
Bug: 332594828
Change-Id: I5bc4ed71318e9459b2ed46e1f01d16a7dd49cf7f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3017360



Change-Id: I204c0290dc333da8a8560c007436f24cabd885a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

We need to add a number of Rust crates as allowed dependencies for
aconfig codegen, that will be used on all mainline modules.

Bug: 328444881
Test: m
Apex-Size-Increase: 157 KiB
Previous-Platform-Support: yes
Aosp-First: aconfig is an aosp-first project
Test-Info: tests exist for each independent dependency
Change-Id: I6a730476a306d2d5c62d029fc5b6d650b153bbde

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3002837



Change-Id: Id02972ce11c572e4291db008c1adc0b7b9609d33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3012893



Change-Id: Iaf6cb3be79510783fe8e4d288721bb7077311891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Add a new release_config flag to finalize_sdk script to correct the
build target for git_main branches.
The flag is optional.

Bug: 321970705
Test: packages/modules/common/tools/finalize_sdk.py -f 12 -b 256848771 -rc mainline -r 'Testing' -m com.google.android.adservices -m com.google.android.mediaprovider 11609273
Change-Id: I7d54eea799cc9be968976d07fb2fd5f587c71502

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3003858



Change-Id: I4be878f6fa39fb2eae49588e968448d553452f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Currently there exist no mapping between the module name to its git
project directory (for prebuilts/module_sdk).

This CL adds a .json file to android build artifacts, which can be
fetched to obtain this mapping.

The .json file contents for 2 modules looks like -
{
    "com.google.android.adservices": {
        "module_sdk_project": "prebuilts/module_sdk/AdServices"
    },
    "com.google.android.appsearch": {
        "module_sdk_project": "prebuilts/module_sdk/AppSearch"
    },
}

This can be extended to add any more information about a module.

Bug: 321970705
Test: packages/modules/common/build/mainline_modules_sdks.sh --build-release=latest
Test: The file generates successfully at dist root.
Test: atest mainline_modules_sdks_test
Change-Id: I2fde908612b890057ce79ef1eb2668168ca070df

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3004161



Change-Id: I8178135682373124c5f0bc26d613a93f01212a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Commit 5c49b1c2 changed how build_number.txt is generated. As a
result, BUILD_NUMBER is no longer used. Remove it.

Bug: N/A
Test: croot && packages/modules/common/build/mainline_modules_sdks.sh --build-release next
Change-Id: I89e2bc912fac11d8ac8b98e48135958b3d19b1ec

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3007352



Change-Id: I858b55339d8b415c95f01dbbdbe6ab2f464df0de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3008054



Change-Id: I5cf68f5b13ba7aebf17dcda82c9d1fcae28dece5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>