aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix dependencies of packages that target earlier releases"•••am: bde4c9a8df Change-Id: I24ee27f2d99de7cee6aace00b3d721cd91fff3d4 Paul Duffin2017-06-151-2/+3
|\
| * Merge "Fix dependencies of packages that target earlier releases"Paul Duffin2017-06-151-2/+3
| |\
| | * Fix dependencies of packages that target earlier releases•••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 Paul Duffin2017-06-141-2/+3
| |/
* | Merge "Prepare for removal of junit and android.test classes from Android API...•••am: 83f0d8dc18 Change-Id: If0e4bdafb4e4451315b5a7270cfe9526d65b38f4 Paul Duffin2017-05-081-1/+4
|\|
| * Merge "Prepare for removal of junit and android.test classes from Android API...Paul Duffin2017-05-081-1/+4
|/|
| * Prepare for removal of junit and android.test classes from Android API (step 1)•••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: I160c136ecd1089a2b13d5cdba9eee1287aad93f9 Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2 Paul Duffin2017-05-081-1/+4
|/
* Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2017-04-0323-52/+52
|\
| * Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 36832302 Change-Id: I6f0c71c1cf7d5fda940bcc2a164ccef590d1db4d Bill Yi2017-04-0223-52/+52
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-04-0212-18/+18
|\ \
| * | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 36832302 Change-Id: I6b9237cb556259ed9803ae1bef977d284d93d618 Bill Yi2017-04-0212-18/+18
| |/
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-04-024-4/+4
|\ \
| * | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 36832302 Change-Id: I1982e54320535710dbdc834c27ef2d1fa8943d2b Bill Yi2017-04-024-4/+4
| |/
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-04-021-2/+2
|\ \
| * | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 36832302 Change-Id: I445089565caa6c65a090b8f09a6b6502c32c2de0 Bill Yi2017-04-021-2/+2
| |/
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-04-021-1/+1
|\ \
| * | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 36832302 Change-Id: Ia1da75e3245c7fd496cf2874661b52a32ca24fd1 Bill Yi2017-04-021-1/+1
| |/
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-04-022-17/+17
|\ \
| * | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 36832302 Change-Id: I383339746de9527c4a03e2e73697771f9c2310da Bill Yi2017-04-022-17/+17
| |/
* / Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 36832302 Change-Id: I33c7a3e55084f5f827b1833fed0142e800a38950 Bill Yi2017-04-0277-823/+824
|/
* Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev•••am: f304362edc -s ours Change-Id: I03a819a1f7f66d69b429e30ec02b3bcd3444150c Bill Yi2017-02-160-0/+0
|\
| * Merge "Import translations. DO NOT MERGE" into nyc-mr2-devTreeHugger Robot2017-02-162-2/+2
| |\
| | * Import translations. DO NOT MERGE•••Change-Id: I65cc4ee1caea5d9d8e9a704549175e52611ba0b9 Auto-generated-cl: translation import Bill Yi2017-02-152-2/+2
* | | Import translations. DO NOT MERGE•••am: 4cf3910930 -s ours Change-Id: I7745da480f983d2e46b8e7b4e9bbeefd1ab8cc9b Bill Yi2017-02-160-0/+0
|\| |
| * | Import translations. DO NOT MERGE•••Change-Id: If68282123e97f900198a68725a1a98dc633115b7 Auto-generated-cl: translation import Bill Yi2017-02-151-1/+1
| |/
* | Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev•••am: 384007ac74 -s ours Change-Id: I535ef14456b854ca70b6dac5705e3d5024106ecb Bill Yi2017-02-030-0/+0
|\|
| * Merge "Import translations. DO NOT MERGE" into nyc-mr2-devTreeHugger Robot2017-02-031-2/+2
| |\
* | \ Import translations. DO NOT MERGE•••am: dd6d694fcb -s ours Change-Id: I5060d6560e5e72a402cec4f43b848cc05ca32c71 Bill Yi2017-02-030-0/+0
|\ \ \ | | |/ | |/|
| * | Import translations. DO NOT MERGE•••Change-Id: I7796f5a735a49337ada20e07143db34574a40017 Auto-generated-cl: translation import Bill Yi2017-02-021-2/+2
* | | Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev•••am: 7dbc639446 -s ours Change-Id: I6da3efc5551a2e7c3d6077588e1529366620f26f Bill Yi2017-02-030-0/+0
|\ \ \ | | |/ | |/|
| * | Merge "Import translations. DO NOT MERGE" into nyc-mr2-devTreeHugger Robot2017-02-0313-23/+23
| |\ \
* | \ \ Import translations. DO NOT MERGE•••am: 2b39ab6454 -s ours Change-Id: Ic4828b1300d4a298b4e7ab5d590f28cff7e6b1a5 Bill Yi2017-02-030-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Import translations. DO NOT MERGE•••Change-Id: I9a224565bb46caa20ead911a74702c773ea2a282 Auto-generated-cl: translation import Bill Yi2017-02-0213-23/+23
| | |/ | |/|
* | | Import translations. DO NOT MERGE•••am: 99348c75da -s ours Change-Id: I5183ee927d1bd4055c15d4e8434aa58f0393dc2d Bill Yi2017-02-030-0/+0
|\ \ \ | | |/ | |/|
| * | Import translations. DO NOT MERGE•••Change-Id: I81c09641bd1dd7c3366bb9de425888c0f536763e Auto-generated-cl: translation import Bill Yi2017-02-024-6/+6
| |/
* | Merge "Use junit-host instead of junit" am: 8293d4f266 am: e4ea7e8191•••am: 17a53d5e94 Change-Id: I0592babdb41bcb9ee4110c3b6ba67787699d0959 Paul Duffin2016-11-302-3/+3
|\ \
| * \ Merge "Use junit-host instead of junit" am: 8293d4f266•••am: e4ea7e8191 Change-Id: If20a9b9cf3df8b512a9f802d940383fba77b5ad6 Paul Duffin2016-11-302-3/+3
| |\ \
| | * \ Merge "Use junit-host instead of junit"•••am: 8293d4f266 Change-Id: Ic5bb8ac0b30e42bb30952569f49cc74705f036c9 Paul Duffin2016-11-302-3/+3
| | |\ \
| | | * \ Merge "Use junit-host instead of junit"Paul Duffin2016-11-302-3/+3
| | | |\ \
| | | | * | Use junit-host instead of junit•••Use framework/junit-host.jar instead of framework/junit.jar Ran the script before and after making the change and it failed in the same way with a build error but it was not due to a problem with JUnit. Bug: 30188076 Test: make checkbuild and ran the test-dicttool.sh script Change-Id: I4cdd518f38184ff3ade5a06d968d6902770ece6b Paul Duffin2016-11-302-3/+3
| | | |/ /
* | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 634fc5a4...•••am: efa89be550 -s ours Change-Id: I5706d06d3c022bf56c9f7f6a5c2a6ebc8a80646c Bill Yi2016-11-210-0/+0
|\| | | |
| * | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master•••am: 634fc5a417 -s ours Change-Id: Ib385da702d6b94aba349f39b8c84e728573e416b Bill Yi2016-11-210-0/+0
| |\| | |
| | * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-11-2112-16/+16
| | |\ \ \
* | | | | | Import translations. DO NOT MERGE am: 11443a10b9 -s ours•••am: 3bbc35a294 -s ours Change-Id: I15b2b4c3acbb28014f01af559ae2d62ab5ac77d1 Bill Yi2016-11-210-0/+0
|\| | | | |
| * | | | | Import translations. DO NOT MERGE•••am: 11443a10b9 -s ours Change-Id: Ifae68ac6f58c78267743bcb214aac09ddef0afae Bill Yi2016-11-210-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 32177112 Change-Id: Ib276271b318f0e132d02ee9426b5fb5c57e1187f Bill Yi2016-11-2012-16/+16
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 60a9f4ca...•••am: e869c4ef32 -s ours Change-Id: I7292fed672e9a19f5d1777dc3f52d05735d797db Bill Yi2016-11-210-0/+0
|\| | | | |
| * | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master•••am: 60a9f4ca18 -s ours Change-Id: I799138b6ee168bb2ce217475ce252921b8925c52 Bill Yi2016-11-210-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-11-2177-796/+797
| | |\ \ \ \
* | | | | | | Import translations. DO NOT MERGE am: e8b1aebb88 -s ours•••am: 489f0674c8 -s ours Change-Id: Ic068960e0e7b935b943964d87bebda716ee2a770 Bill Yi2016-11-210-0/+0
|\| | | | | |
| * | | | | | Import translations. DO NOT MERGE•••am: e8b1aebb88 -s ours Change-Id: Ib037075c687f622e9dfe6ca64173d3316674121c Bill Yi2016-11-210-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-08-02 00:04:41 +0000