Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/3324518



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

Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/3324518



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

If found, flagged-api.json will be passed to the transformer to annotate
any type or method with @FlaggedApi.

Test: external/conscrypt/srcgen/generate_android_src.sh
Change-Id: I289fbf18dbba83c5d2df1cd451f57f6bc6786e19

Merge "Allow currysrc users to override srcgen and output directories" am: 0ed3bdf3 am: e7290b44 am: c39f198a

Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/1555397

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5899998471ff5c1fa36a1a5c05e7ffd77a91f1c

Merge "Allow currysrc users to override srcgen and output directories" am: 0ed3bdf3 am: e7290b44

Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/1555397

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddb4fad587d0b521355cb79bece4c6e50909249c

Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/1555397

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbe7500c428f0f3a09a79c459ca5c338d209ddac

Bug: 154796679
Test: run the generation with and without new parameters

Change-Id: I9449d82d6aef14feef53c0049f5ac3ccc4ef6b8f

Update currysrc to support stable core/platform API. am: 7074dfcc am: 6a4ae9b8 am: cd7215e3 am: a71da3da am: 63d01f31

Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/1331085

Change-Id: I1bbb7c27e778b6a4416f1e118a856528bc3f8b88

Update currysrc to support stable core/platform API. am: 7074dfcc am: 6a4ae9b8 am: cd7215e3 am: a71da3da

Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/1331085

Change-Id: Ie3ccf1bf0ec7cc0b3a428bd7c33ba26a3dd4848e

Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/1331085

Change-Id: I0574fad39bc25823ceb562f4ef497b6bb3de1ffb

Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/1331085

Change-Id: Ie5682fc21dd7b8643f3ff4dd078a0091fa32b96d

Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/1331085

Change-Id: Id9149fb152f85b4227caba05ac45a5518e26ad89

This change allows you to specify a flat file to add
@CorePlatformApi(status=STABLE) to (previously it only supported bare
@CorePlatformApi). This would have been possible using the JSON format
before, but this would be more verbose and error-prone in the case (as
with conscrypt) where the whole surface is stable.

Test: external/conscrypt/srcgen/generate_android_src.sh (and check result)
Bug: 157640067
Change-Id: Ie69e2805ed6c76cde395e48532236fdd31bb0c67

Change-Id: I8e29389c85d0176759a58d0bba4899b1a39d2d19

Change-Id: Id4ddb2398489c33fc13e5d633733c79f9d3879e6

am: 0b1b0c9c

Change-Id: Ib4d582cb000253e9b942bd2c8bd588bcd9fac5ea

Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I94f5016048f78f0be20bb1be7dcd495f797662bc

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 557e8a26
am: 9c3e3982 -s ours
am skip reason: subject contains skip directive

Change-Id: If6c4a71223223dcd79a50f71feb3ef471c4f5198

am: 557e8a26

Change-Id: Ideacf0f5cd210c2de81e10530ae46e5b12864f36

Bug: 142003500
Change-Id: I03369ae08d7cb554adeabdb24a2f0cbd372b4961

am: 7c378271

Change-Id: I33101a3d51c9e7d50952e535d46d1aef357665cf

am: b4db485d

Change-Id: Ib51ba2a7a5e02ee9f5211c16913af5edede48e15

am: 9fd111d6

Change-Id: Idb6819134a07aecad6e7aa47c6c0eb2b0b0a2783

am: 51931e25

Change-Id: Ia28b1b92553bc8ba24ba51d3b32c3e3c2f8f34cf

Running a script like external/conscrypt/srcgen/generate_android_src.sh
removed the TEST_MAPPING files. This change restores them by checking
them out of git. This does mean that if a TEST_MAPPING file has been
edited that the changes will be lost.

Test: external/conscrypt/srcgen/generate_android_src.sh
Change-Id: Ifedff3823f14a7a098a677709bf1ce89b5a8c22d

am: 589fccd3

Change-Id: Ifc8e360a45cd138fdd66b1e80c2d39374b56c13f

am: fdd807eb

Change-Id: Ia785e475305895a23e8619d7f3188b02e88ddbf0

am: 1dfdf290

Change-Id: I39c5deb3c3733496511af64d07b56d9dcaa60750

am: c091e06b

Change-Id: I059a4becde3bc3005723972f765e3695bab98803

Currysrc can be used to repackage source files. The repackage-common.sh
currently references 'make' in this process, which is now not supported
by build/make/core/main.mk. Instead, build/soong needs to be used for
this operation.

Bug: 141146348
Test: make
Change-Id: I468a7417fcac92f248bd395bb19d8bce46b5433c

am: 29e509d5

Change-Id: Ib8886484d1cc1bfa12209c3f90f2461281847e72

am: cc80512f

Change-Id: Ida3b3ac105c29491afbce3a2ffa73f52b631b4dc

am: c3895a5a

Change-Id: I750ec4be45e79ae26d56ccece01f2e6fcd1c9d86

am: bfdb78a3

Change-Id: I713ab3b23428e614ed55c78c2bda5e3a6476dc1d

The syntax requires the project to be specified
as a prefix.

Change-Id: I67d985d627999c2009d8b0370742b02ab54e86f4
Exempt-From-Owner-Approval: Fixes OWNERS
Test: None

am: 8c675fe6

Change-Id: I007ec4b70a1b2dd41adfc9f2e48345a50861a351

am: 80ed8ea9

Change-Id: I7980359ba5db6d260a7f8c85337881eba8f80382

am: 66f5bcf8

Change-Id: I467b2c73b5f88f033561b0f417df4d732ae4f330

am: 1e383ae3

Change-Id: I191eb76f947ae2b2f685f1d428ac2b5c6295fe2d