Change-Id: I19382779b7b3b819c10dc5081029edd3ae494213

With https://r.android.com/3048855, use_source_config_var has become a
no-op for source vs prebuilt selection. This CL updates the module sdk
generation script to drop this property from V and above snapshots. For
backwards compatibility, this property will be kept in the generated
snapshots for T and U

Implementation Details:
This has implemented by introducting a new mode
`PreferHandling.USE_NO_PREFER_PROPERTY`. When this mode is selected, the
generated Android.bp will not contain `prefer: false`. This
differentiates it from `PreferHandling.None` which keeps the `prefer:
false`.

Test: Generated module sdk snapshot for Adservices. The Android.bp
corresponding to "next" looks like this: https://paste.googleplex.com/6505539983114240
Test: presbumits

Bug: 335721403
(cherry picked from https://android-review.googlesource.com/q/commit:d790ff73020bea233d68372aeb4bb4e9712d25b2)
Merged-In: Ibc28e7e6dfbd6b28c47be5f5c6a71ba2610872de
Change-Id: Ibc28e7e6dfbd6b28c47be5f5c6a71ba2610872de

Change-Id: I326f12d0beed628f6e6b81cd3cd964f383b32473

With https://r.android.com/3048855, use_source_config_var has become a
no-op for source vs prebuilt selection. This CL updates the module sdk
generation script to drop this property from V and above snapshots. For
backwards compatibility, this property will be kept in the generated
snapshots for T and U

Implementation Details:
This has implemented by introducting a new mode
`PreferHandling.USE_NO_PREFER_PROPERTY`. When this mode is selected, the
generated Android.bp will not contain `prefer: false`. This
differentiates it from `PreferHandling.None` which keeps the `prefer:
false`.

Test: Generated module sdk snapshot for Adservices. The Android.bp
corresponding to "next" looks like this: https://paste.googleplex.com/6505539983114240
Test: presbumits

Bug: 335721403
(cherry picked from https://android-review.googlesource.com/q/commit:d790ff73020bea233d68372aeb4bb4e9712d25b2)
Merged-In: Ibc28e7e6dfbd6b28c47be5f5c6a71ba2610872de
Change-Id: Ibc28e7e6dfbd6b28c47be5f5c6a71ba2610872de

Change-Id: I784ebbf95a6d6619d746f9279ce94036fa7ca60e

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



Change-Id: I9e2be8b16c2d2676f447d13cd61862c366747335
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/+/3128653



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

Change-Id: Ic6751b95a7050559f7744cbe7162da63ed5da379

Merge "Part 2: Fix finalize_sdk script execution for "all modules" case" into main am: 98b30ed2 am: 0a700592

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



Change-Id: Ia5afe383e7b790011e12de02e30cac5934ab22db
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/+/3129114



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

aosp/3005020 broke the finalize_sdk script for the special case when
no modules are passed as parameter.
Though it works correctly when any non-empty list of subset of valid
mainline modules is passed.

Emtpy module list implies all modules are finalized. In that case, all
module_sdk zip files are fetched and is extracted by finding the
corresponding prebuilts repo for the module_sdk.

Currently this mapping is from module_name to its prebuilts repo.
This fix adds sdk_name to the mainline-modules-info.json file which
help to find the prebuilts repo using the sdk_name of the module.

This fix is split into 2 CLs -
1. Adds sdk_name to mainline-modules-info.json.
2. Update finalize_sdk script to use sdk_name to fetch prebuilts repo.

This CL addresses part #2.

Bug: 321970705
Test: packages/modules/common/tools/finalize_sdk.py -f 14 -b 256848771 -r 'Finalized for testing' -c mainline 11965776

Change-Id: Ib5ccd6b96cbab51a3121a065a507b5e93f3d0134

Minimizes merge conflicts by ignoring existing androidx.* entries.

Bug: 333398044
Test: manual
Change-Id: Ib63c093d58479d3bd2dfa52ea2bd3626c8ffcf86

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



Change-Id: I6e451569c0171b77d991086d13655805afcd51bb
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/+/3128693



Change-Id: I26e048980640ea301a9b6bd4d44e373109135dbc
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/+/3128032



Change-Id: I3d15cbed7c3d3e6bde601c70702f813f982ed0c9
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/+/3128032



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

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

aosp/3005020 broke the finalize_sdk script for the special case when
no modules are passed as parameter.
Though it works correctly when any non-empty list of subset of valid
mainline modules is passed.

Emtpy module list implies all modules are finalized. In that case, all
module_sdk zip files are fetched and is extracted by finding the
corresponding prebuilts repo for the module_sdk.

Currently this mapping is from module_name to its prebuilts repo.
This fix adds sdk_name to the mainline-modules-info.json file which
help to find the prebuilts repo using the sdk_name of the module.

This fix is split into 2 CLs -
1. Adds sdk_name to mainline-modules-info.json.
2. Update finalize_sdk script to use sdk_name to fetch prebuilts repo.

This CL addressed part #1.

Bug: 321970705
Test: atest --host mainline_modules_sdks_test --no-bazel-mode
Change-Id: I83ec8a994f851a484be25df405e4b99e1b7392fb

Change-Id: Ic79f89532d03a8f33d877eed059beff75bfe7a74

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

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

Bug: 342332820
Test: RUN_ERROR_PRONE=true m -j96 javac-check lint-check dist
Test: Forrest build.
No-Allowed-Deps-Check: Only affects coverage builds.
Change-Id: Ibff5f723afe49304940d98d03e539c4f51237dd8

Change-Id: Id04d26b001ded612bbe278fa1c0f2f1053a7a6b1

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

Change-Id: I64d52c1c49ea3255d3e676918caa37c895d70ae1

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