aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2017-06-201-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia1ba3afca4c2e76f073d9f0fbe4b1cb317eadd59 Auto-generated-cl: translation import
* / / / / / / / Import translations. DO NOT MERGEBill Yi2017-06-201-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I67380e155bb7d31b62e7a429d01823d34b9c57cd Auto-generated-cl: translation import
* | | | | | | Merge "Fix dependencies of packages that target earlier releases" am: ↵Paul Duffin2017-06-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bde4c9a8df am: c44dd5a879 -s ours am: dec3c3d02b -s ours am: da238095c9 -s ours Change-Id: I4f8cf81dd24b1c21efb52a166eea70abd1dd8785
| * | | | | | Merge "Fix dependencies of packages that target earlier releases" am: ↵Paul Duffin2017-06-150-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bde4c9a8df am: c44dd5a879 -s ours am: dec3c3d02b -s ours Change-Id: Ief9ddd7f24e1b921e9905cc334780e45b9f67218
| | * | | | | Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a8dfPaul Duffin2017-06-150-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c44dd5a879 -s ours Change-Id: I08f18c4bf6f373548509882f55d1161b35fc752a
| | | * \ \ \ \ Merge "Fix dependencies of packages that target earlier releases"Paul Duffin2017-06-151-2/+3
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | am: bde4c9a8df Change-Id: I24ee27f2d99de7cee6aace00b3d721cd91fff3d4
| | | | * | | | Merge "Fix dependencies of packages that target earlier releases"Paul Duffin2017-06-151-2/+3
| | | | |\ \ \ \
| | | | | * | | | Fix dependencies of packages that target earlier releasesPaul Duffin2017-06-141-2/+3
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Fix dependencies of packages that target earlier releases am: 6767e05934Paul Duffin2017-06-141-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6736fb2967 Change-Id: Ie2bfb2e0c422e7a7e2f9cf96ba38e989d0c3c8a9
| * | | | | | | Fix dependencies of packages that target earlier releasesPaul Duffin2017-06-141-2/+3
| |\| | | | | | | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | am: 6767e05934 Change-Id: I84712a036ee5e2b2eda093f6eda614acc34c4bba
| | * | | | | Fix dependencies of packages that target earlier releasesPaul Duffin2017-06-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Import translations. DO NOT MERGEBill Yi2017-06-121-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I339bad8aea01e66659787d8a9a06ce01112e03c5 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-311-1/+1
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBill Yi2017-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f7f8dd206a91c73781fbcf24900a631f90f3474 Auto-generated-cl: translation import
* | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-311-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7bc939b0a283fe72d730e9ad0084e1ffa4bd50db Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEBill Yi2017-05-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib413b1988ad8828fdd42b34e9a2ad26c6237ce5a Auto-generated-cl: translation import
* | | | | | Merge "Revert "Revert "Use AAPT2""" into oc-dev am: e6cfc2ff63Adam Lesinski2017-05-191-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e777c7bdc7 Change-Id: Ibf41dc758b32f4b4f0398c5013ad6d3899743f49
| * | | | | Merge "Revert "Revert "Use AAPT2""" into oc-devAdam Lesinski2017-05-191-1/+6
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | am: e6cfc2ff63 Change-Id: I7634a7cedd45ee01facad8cc91316ce7cf1544eb
| | * | | | Merge "Revert "Revert "Use AAPT2""" into oc-devTreeHugger Robot2017-05-191-1/+6
| | |\ \ \ \
| | | * | | | Revert "Revert "Use AAPT2""Adam Lesinski2017-05-171-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit af1177453d95d727651cf48a380d7979dc94ae45. Reason for revert: Bug in aapt2 was fixed b/38152130 Change-Id: I2701d67f581165d371a745749367c0c825168e22
* | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-163-11/+11
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-163-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I433c4b65242ec711f0198a52e3041e8e2449f8cc Auto-generated-cl: translation import
* | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-161-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I59054386d3666143821916c57c3ce9b6cbb3aaa1 Auto-generated-cl: translation import
* | | | | | | | Merge "Revert "Use AAPT2"" into oc-dev am: 3ac57504cdAlan Viverette2017-05-161-6/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | | | | | | | | am: 811b5295df Change-Id: Ifbf1782b7c55f7414b29215711c9cb08b69dd256
| * | | | | | Merge "Revert "Use AAPT2"" into oc-devAlan Viverette2017-05-161-6/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3ac57504cd Change-Id: I45cb9a9ecfe5d273a2bfd56463c7a7ada868bf67
| | * | | | | Merge "Revert "Use AAPT2"" into oc-devTreeHugger Robot2017-05-161-6/+1
| | |\| | | |
| | | * | | | Revert "Use AAPT2"Alan Viverette2017-05-151-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0f6f5c017629befcc4b8d9f1111e18d3505bfac1. Change-Id: Ibba7d35846cdbf6086877fd2859c2e2c91dcf2ee
* | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-115-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-115-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5ff5d90c163bfb05bd4d8db583ed1deee5d844c4 Auto-generated-cl: translation import
* | | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-111-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifc3bd3ad01d6dc66711756664a51f1340cc8221b Auto-generated-cl: translation import
* | | | | | | Merge "Prepare for removal of junit and android.test classes from Android ↵Paul Duffin2017-05-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API (step 1)" into oc-dev-plus-aosp am: 28f867d780 -s ours Change-Id: Ifacc5fa99c5bf427504a6a8a8c71e57e251624b7
| * | | | | | Merge "Prepare for removal of junit and android.test classes from Android ↵Paul Duffin2017-05-111-1/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | API (step 1)" into oc-dev-plus-aosp
| | * | | | | | Prepare for removal of junit and android.test classes from Android API (step 1)Paul Duffin2017-05-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for removing junit and android.test classes from the Android API this change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. Care was taken to ensure that any targets that depended, directly or indirectly, on android-support-test did not also depend on junit or hamcrest as they conflict with the versions embedded within android-support-test. Bug: 30188076 Test: make checkbuild Change-Id: Icf844999082db141cffcb099aa4004afc7a7c749 Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2
* | | | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev am: add95c01b9 -s oursBill Yi2017-05-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4d3b0f119f -s ours Change-Id: Ib7dcfe1de90c6c25fd1bd59cf1261714152d64c6
| * | | | | | | Merge "Import translations. DO NOT MERGE" into oc-devBill Yi2017-05-110-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: add95c01b9 -s ours Change-Id: If0a6f3ad7aede027d34bdce9ca6cceb7457ea210
| | * | | | | | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-05-112-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | Import translations. DO NOT MERGEBill Yi2017-05-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I79556fca866d6054a2327222d73809e93ba80185 Auto-generated-cl: translation import
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev am: d20b8bd58d -s oursBill Yi2017-05-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fd3a13903f -s ours Change-Id: I66a10ca46048c3bdf0f134b66d81352a238d52c5
| * | | | | | | | Merge "Import translations. DO NOT MERGE" into oc-devBill Yi2017-05-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d20b8bd58d -s ours Change-Id: Id10c6493693229151d15ddd872188ace68e73429
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-05-113-4/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-103-4/+4
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id738f4b110ee27a2c18cf8ade15afe67e5b150f8 Auto-generated-cl: translation import
* | | | | | | | | Import translations. DO NOT MERGE am: 99d1abb252 -s oursBill Yi2017-05-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7067b4a34f -s ours Change-Id: Ifd99a7bc781a8fa50be033aeef32e20711bb1440
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-110-0/+0
| |\| | | | | | | | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 99d1abb252 -s ours Change-Id: I9c07e145ba5f24496df9cee2849e171496ab4697
| | * | | | | | Import translations. DO NOT MERGEBill Yi2017-05-1013-25/+25
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icaa3e3e60a2e632a02a317b0dad32c9c6e3c1072 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-097-17/+17
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-087-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ief94504ab531dd149c64aa56ac8ffe1433107e55 Auto-generated-cl: translation import
* | | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-081-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I221b061d69263c60affc309dc69ac3e06041e4a8 Auto-generated-cl: translation import
* | | | | | | Merge "Prepare for removal of junit and android.test classes from Android ↵Paul Duffin2017-05-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API (step 1)" am: 83f0d8dc18 am: 341a052cf9 am: 5151513a15 -s ours am: 439ca466de -s ours Change-Id: Iefca108075e53bcb59dcb71c3d2c21649d0d1964
| * | | | | | Merge "Prepare for removal of junit and android.test classes from Android ↵Paul Duffin2017-05-080-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API (step 1)" am: 83f0d8dc18 am: 341a052cf9 am: 5151513a15 -s ours Change-Id: I1551963c45f5d4b94d1fe42d3405350eda4ca389
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-08-02 00:47:21 +0000