Change-Id: I41e90adef74ec4238aa684e9366b25d228ca6fc9
Test: Prebuilts
Aosp-First: No
Apex-Size-Increase:
Previous-Platform-Support: No
Test-Info:Android JUnit Test
ignore-AOSP-First: Merge conflict resolution

Merge "Add module_proto_key field to MainlineModule in mainline_modules_sdks" into main am: daef5e93 am: 9b7a4aec

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



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

Merge "Add module_proto_key field to MainlineModule in mainline_modules_sdks" into main am: daef5e93

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



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

module_proto_key field will contain a mapping between the Mainline
module and its corresponding entry in the SdkModule Enum key in
packages/modules/common/proto/sdk.proto file.

This mapping is added to mainline-modules-info.json file, which allows
fetching this mapping in google3. And hence can be used to pass these
proto keys values are parameter to the gen_sdk script when executed
in google3 via Gantry.

Bug: 321970705
Test: packages/modules/common/build/mainline_modules_sdks.sh --build-release=latest
Test: atest --host mainline_modules_sdks_test --no-bazel-mode
Change-Id: I83d14ba509f85e168e6751675bea409fd7fdba8c

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



Change-Id: Idfacede8e0d4b2e3fcee1cde5e5d799974cf8e23
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/+/3118391



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

Add a new flag to detect that the script is being executed by Gantry.
The following changes are made when executed via Gantry -
1. The artifacts are fetched in /tmp/ directory, so that they can be
directly used to raise gerrit changes via google3.
2. Since it is an automated execution, no need to check if the script
is executed for Android root.
3. Since google3 does not have repo initialized and the git projects
does not exist in google3, do not use repo and git commit commands.
4. The prebuilts/sdk/extensions/README.md file update will be handled
explicitly in google3, and hence does not require update via finalize
sdk script.

Bug: 321970705
Test: packages/modules/common/tools/finalize_sdk.py -f 14 -b 256848771 -c mainline -r 'Finalization Test' -m com.google.android.adservices 11609273

Change-Id: I9a4fe78dd2fd628e155c2bbd9b3d4bf539396dfb

Change-Id: Icd274d472aea6a156eb8c2e375b47647653277ae
Test: Prebuilts
Aosp-First: No
Apex-Size-Increase:
Previous-Platform-Support: No
Test-Info:Android JUnit Test
ignore-AOSP-First: Merge conflict resolution

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



Change-Id: I70c2c865279ca22218bbd3be3bcb21fe46a083a8
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/+/3005020



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

Change-Id: Iccb48396e5c35f2c8dcfd86a82f6bca0217da4a5
Test: Prebuilts
Aosp-First: No
Apex-Size-Increase:
Previous-Platform-Support: No
Test-Info:Android JUnit Test
ignore-AOSP-First: Merge conflict resolution

am skip reason: Merged-In Ib68379df95257d0ab09d5a0b248d799925f94271 with SHA-1 2cb57155 is already in history

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



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

Change-Id: I9730832c1c3358459c59441e891c255219fb21f7
Test: Prebuilts
Aosp-First: No
Apex-Size-Increase:
Previous-Platform-Support: No
Test-Info:Android JUnit Test
ignore-AOSP-First: Merge conflict resolution

Change-Id: Iedc92a3f585dd8f1e63423b9023d52672d57af39
Test: Prebuilts
Aosp-First: No
Apex-Size-Increase:
Previous-Platform-Support: No
Test-Info:Android JUnit Test
ignore-AOSP-First: Merge conflict resolution

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



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

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

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

Change-Id: Ia127cfee79618065f18062456c5b42ca8c68e62c
Test: Prebuilts
Aosp-First: No
Apex-Size-Increase:
Previous-Platform-Support: No
Test-Info:Android JUnit Test
ignore-AOSP-First: Merge conflict resolution

[automerger skipped] Remove com.android.location.provider in aosp_mainline_modules am: baea79be -s ours

am skip reason: Merged-In I419ed482592f0915d027519873c595aa42db79cf with SHA-1 caba1a1f is already in history

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



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

am skip reason: Merged-In I3fb278feaa015ecbe3bb3a38440561533af8ad46 with SHA-1 71734da3 is already in history

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



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

Change-Id: I5296c4854e02a8d9f7c73cd57d40805bd93ca4a9
Test: Prebuilts
Aosp-First: No
Apex-Size-Increase:
Previous-Platform-Support: No
Test-Info:Android JUnit Test
ignore-AOSP-First: Merge conflict resolution

Bug:340711546

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

Because it is unintentional added.

Bug: 321000103
Test: build
(cherry picked from https://android-review.googlesource.com/q/commit:e4c585dca4c918cb7fb3044dfd043b1746f0bf18)
Merged-In: I419ed482592f0915d027519873c595aa42db79cf
Change-Id: I419ed482592f0915d027519873c595aa42db79cf
(cherry picked from commit caba1a1f)

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.

It's a placeholder to unblock automerge

Bug: 321000103
Test: m nothing
Ignore-AOSP-First: new type of visibility doesn't exist in udc
Change-Id: I3fb278feaa015ecbe3bb3a38440561533af8ad46
Merged-In: I3fb278feaa015ecbe3bb3a38440561533af8ad46

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



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

bug: 342004964
Change-Id: Ie772a8a7d3a9edfb88299b1dcaef8e4fb1e36ee3
Aosp-First: No
Apex-Size-Increase:
Previous-Platform-Support: yes
Test-Info:Android JUnit Test
ignore-AOSP-First: Merge conflict resolution

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



Change-Id: I572b6025b72d6468ecdc5cbfd549905b635c37e0
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/+/3069906



Change-Id: Ifb49a8fcf9d4fb473fd4fd57854587d0e5d2eb7b
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/+/3069906



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