Change-Id: I67380e155bb7d31b62e7a429d01823d34b9c57cd
Auto-generated-cl: translation import

Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a8 am: c44dd5a8  -s ours am: dec3c3d0  -s ours
am: da238095  -s ours

Change-Id: I4f8cf81dd24b1c21efb52a166eea70abd1dd8785

Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a8 am: c44dd5a8  -s ours
am: dec3c3d0  -s ours

Change-Id: Ief9ddd7f24e1b921e9905cc334780e45b9f67218

am: c44dd5a8  -s ours

Change-Id: I08f18c4bf6f373548509882f55d1161b35fc752a

am: bde4c9a8

Change-Id: I24ee27f2d99de7cee6aace00b3d721cd91fff3d4

am: 6736fb29

Change-Id: Ie2bfb2e0c422e7a7e2f9cf96ba38e989d0c3c8a9

am: 6767e059

Change-Id: I84712a036ee5e2b2eda093f6eda614acc34c4bba

A previous change added legacy-android-test as a static dependency to
all packages that build against the current, test_current or
system_current and failed to compile when the junit and android.test
classes were removed from the API. Unfortunately, those changes did not
take into account that some of those packages target earlier API
versions and so will always have the classes available at runtime.

This change replaces those static dependencies with dynamic dependencies
for any package that targets an earlier API version. The file changes
were made automatically by a tool that constructed and then analyzed a
full dependency graph of all the Android Java modules. The individual
changes were checked manually to ensure that the changes matched the
intent. The affected modules were built against an API with the junit
and android.test classes removed. Any issues found during this process
resulted in either the tool being updated to address the issue or a
separate change being made to fix an existing problem with the build. A
sample of the affected packages were run to ensure that they worked as
expected at runtime; no issues were found during testing.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because LatinIMETests's manifest file (AndroidManifest.xml) targets
    API level 21 and dynamically includes the android.test.runner
    library at runtime so there is no point in statically including the
    classes.

    Added 'android.test.mock.sdk' and 'legacy-android-test' to
    LOCAL_JAVA_LIBRARIES because module LatinIMETests builds against
    'LOCAL_SDK_VERSION := current' and uses classes from packages
    android.test and android.test.mock (possibly indirectly) so will no
    longer compile once they are removed from the API.

    Dependency 'android.test.mock.sdk' is used instead of
    'android.test.mock' because module LatinIMETests builds against the
    API not internal jars and so should use libraries that build
    against the API not internal jars.

    A future change will replace the dependency on
    'legacy-android-test', which builds against the internal jars with
    a dependency on 'android.legacy.test' which will build against the
    API.

Bug: 30188076
Test: make checkbuild and ran a sample of tests
Change-Id: I63f1a8ad16a76aba0da89b69a64cdae4400af5a0
Merged-In: Icab8a4c4801536f112e29dfd2dc66be8b90b811d

A previous change added legacy-android-test as a static dependency to
all packages that build against the current, test_current or
system_current and failed to compile when the junit and android.test
classes were removed from the API. Unfortunately, those changes did not
take into account that some of those packages target earlier API
versions and so will always have the classes available at runtime.

This change replaces those static dependencies with dynamic dependencies
for any package that targets an earlier API version. The file changes
were made automatically by a tool that constructed and then analyzed a
full dependency graph of all the Android Java modules. The individual
changes were checked manually to ensure that the changes matched the
intent. The affected modules were built against an API with the junit
and android.test classes removed. Any issues found during this process
resulted in either the tool being updated to address the issue or a
separate change being made to fix an existing problem with the build. A
sample of the affected packages were run to ensure that they worked as
expected at runtime; no issues were found during testing.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because LatinIMETests's manifest file (AndroidManifest.xml) targets
    API level 21 and dynamically includes the android.test.runner
    library at runtime so there is no point in statically including the
    classes.

    Added 'android.test.mock.sdk' and 'legacy-android-test' to
    LOCAL_JAVA_LIBRARIES because module LatinIMETests builds against
    'LOCAL_SDK_VERSION := current' and uses classes from packages
    android.test and android.test.mock (possibly indirectly) so will no
    longer compile once they are removed from the API.

    Dependency 'android.test.mock.sdk' is used instead of
    'android.test.mock' because module LatinIMETests builds against the
    API not internal jars and so should use libraries that build
    against the API not internal jars.

    A future change will replace the dependency on
    'legacy-android-test', which builds against the internal jars with
    a dependency on 'android.legacy.test' which will build against the
    API.

Bug: 30188076
Test: make checkbuild and ran a sample of tests
Change-Id: Icab8a4c4801536f112e29dfd2dc66be8b90b811d

Change-Id: I339bad8aea01e66659787d8a9a06ce01112e03c5
Auto-generated-cl: translation import

Change-Id: I8f7f8dd206a91c73781fbcf24900a631f90f3474
Auto-generated-cl: translation import

Change-Id: I7bc939b0a283fe72d730e9ad0084e1ffa4bd50db
Auto-generated-cl: translation import

Change-Id: Ib413b1988ad8828fdd42b34e9a2ad26c6237ce5a
Auto-generated-cl: translation import

am: e777c7bd

Change-Id: Ibf41dc758b32f4b4f0398c5013ad6d3899743f49

am: e6cfc2ff

Change-Id: I7634a7cedd45ee01facad8cc91316ce7cf1544eb

This reverts commit af117745.

Reason for revert: Bug in aapt2 was fixed b/38152130

Change-Id: I2701d67f581165d371a745749367c0c825168e22

Change-Id: I59054386d3666143821916c57c3ce9b6cbb3aaa1
Auto-generated-cl: translation import

Change-Id: I433c4b65242ec711f0198a52e3041e8e2449f8cc
Auto-generated-cl: translation import

am: 811b5295

Change-Id: Ifbf1782b7c55f7414b29215711c9cb08b69dd256

am: 3ac57504

Change-Id: I45cb9a9ecfe5d273a2bfd56463c7a7ada868bf67

This reverts commit 0f6f5c01.

Change-Id: Ibba7d35846cdbf6086877fd2859c2e2c91dcf2ee

Change-Id: I5ff5d90c163bfb05bd4d8db583ed1deee5d844c4
Auto-generated-cl: translation import

Change-Id: Ifc3bd3ad01d6dc66711756664a51f1340cc8221b
Auto-generated-cl: translation import

Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" into oc-dev-plus-aosp
am: 28f867d7  -s ours

Change-Id: Ifacc5fa99c5bf427504a6a8a8c71e57e251624b7

am: 4d3b0f11  -s ours

Change-Id: Ib7dcfe1de90c6c25fd1bd59cf1261714152d64c6

am: fd3a1390  -s ours

Change-Id: I66a10ca46048c3bdf0f134b66d81352a238d52c5

am: 7067b4a3  -s ours

Change-Id: Ifd99a7bc781a8fa50be033aeef32e20711bb1440

Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" into oc-dev-plus-aosp

am: add95c01  -s ours

Change-Id: If0a6f3ad7aede027d34bdce9ca6cceb7457ea210

am: d20b8bd5  -s ours

Change-Id: Id10c6493693229151d15ddd872188ace68e73429

am: 99d1abb2  -s ours

Change-Id: I9c07e145ba5f24496df9cee2849e171496ab4697