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: 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

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>

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

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: I81096ba1be157eaddd22b19d14fc919162c0c843
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/+/3093660



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

Aosp-First: No
Apex-Size-Increase:
Change-Id: I49671a41c3a38c47902c2a500a0bcc5188ae90fd
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/+/3090405



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

Change-Id: Ifeb5d01e159327e3ee94882f8036dba03e6151c9

Test: atest netd_integration_test
Aosp-First: n/a
Test-Info: atest netd_integration_test
Apex-Size-Increase: negligible
Previous-Platform-Support: n/a
Change-Id: I7b716520e2cc02e02c576c9c1ac7eed7b8ba09fd

Bug: 337098550
Merged-In: I536de53d09c7013ba676d56e2a9af226a1b20973
Change-Id: Ic8cbdc7859d4b73af1606ebb85e739a9fd4fa4f0

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



Change-Id: Ice3b136fd5427b28e59d21ad39aa67c2ffdbd7aa
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/+/3079326



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

Change-Id: I321d2c02be24c6a756134ddaec6bb22e6f619f62

This CL reverts commit c978d8fa.

Bug: 332594828
Test: treehugger
Change-Id: Ib5245ad08e80da5ac38433398105e9ea5b1f7325

Apex-Size-Increase: 50k
Previous-Platform-Support: Yes
Aosp-First: Yes
Test-Info: build and verify the channel sounding function on devices.

Bug: 338259287
Test: make
Change-Id: I48703535846bbece8dc93ccb5b2742ba3268e60a

Merge "DO NOT MERGE: Remove com.android.location.provider in aosp_mainline_modules" into main am: 94b86641

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



Change-Id: I6f31652203695f70870e6317d4db32ae994bacbe
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/+/3059802



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

Because it is unintentional added.

Bug: 321000103
Test: build
Change-Id: I419ed482592f0915d027519873c595aa42db79cf
Merged-In: I419ed482592f0915d027519873c595aa42db79cf

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



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

Revert submission 2675705-use-prebuilt-libcxx

Reason for revert: breaks some Android tests (b/337120479, b/337121737, b/337122511)

Reverted changes: /q/submissionid:2675705-use-prebuilt-libcxx

Bug: 337120479
Bug: 337121737
Bug: 337122511
Change-Id: Id07266de2561be6502e37ffda84890a0d55942cf

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>