aboutsummaryrefslogtreecommitdiffstats
path: root/java-overridable/src (unfollow)
Commit message (Collapse)AuthorFilesLines
2017-07-26Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: Ib4e62fdb016fe7a1bf1af921ca278c6163e7da01 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
2017-06-14Fix dependencies of packages that target earlier releasesPaul Duffin1-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
2017-06-13Fix dependencies of packages that target earlier releasesPaul Duffin1-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
2017-05-31Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I8f7f8dd206a91c73781fbcf24900a631f90f3474 Auto-generated-cl: translation import
2017-05-31Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I7bc939b0a283fe72d730e9ad0084e1ffa4bd50db Auto-generated-cl: translation import
2017-05-22Import translations. DO NOT MERGEBill Yi2-4/+4
Change-Id: Ib413b1988ad8828fdd42b34e9a2ad26c6237ce5a Auto-generated-cl: translation import
2017-05-17Revert "Revert "Use AAPT2""Adam Lesinski1-1/+6
This reverts commit af1177453d95d727651cf48a380d7979dc94ae45. Reason for revert: Bug in aapt2 was fixed b/38152130 Change-Id: I2701d67f581165d371a745749367c0c825168e22
2017-05-16Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I59054386d3666143821916c57c3ce9b6cbb3aaa1 Auto-generated-cl: translation import
2017-05-16Import translations. DO NOT MERGEBill Yi3-11/+11
Change-Id: I433c4b65242ec711f0198a52e3041e8e2449f8cc Auto-generated-cl: translation import
2017-05-15Revert "Use AAPT2"Alan Viverette1-6/+1
This reverts commit 0f6f5c017629befcc4b8d9f1111e18d3505bfac1. Change-Id: Ibba7d35846cdbf6086877fd2859c2e2c91dcf2ee
2017-05-11Import translations. DO NOT MERGEBill Yi5-6/+6
Change-Id: I5ff5d90c163bfb05bd4d8db583ed1deee5d844c4 Auto-generated-cl: translation import
2017-05-11Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: Ifc3bd3ad01d6dc66711756664a51f1340cc8221b Auto-generated-cl: translation import
2017-05-10Import translations. DO NOT MERGEBill Yi13-25/+25
Change-Id: Icaa3e3e60a2e632a02a317b0dad32c9c6e3c1072 Auto-generated-cl: translation import
2017-05-10Import translations. DO NOT MERGEBill Yi3-4/+4
Change-Id: Id738f4b110ee27a2c18cf8ade15afe67e5b150f8 Auto-generated-cl: translation import
2017-05-10Import translations. DO NOT MERGEBill Yi2-2/+2
Change-Id: I79556fca866d6054a2327222d73809e93ba80185 Auto-generated-cl: translation import
2017-05-10Prepare for removal of junit and android.test classes from Android API (step 1)Paul Duffin1-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
2017-05-08Import translations. DO NOT MERGEBill Yi7-17/+17
Change-Id: Ief94504ab531dd149c64aa56ac8ffe1433107e55 Auto-generated-cl: translation import
2017-05-08Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I221b061d69263c60affc309dc69ac3e06041e4a8 Auto-generated-cl: translation import
2017-05-08Prepare for removal of junit and android.test classes from Android API (step 1)Paul Duffin1-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: I160c136ecd1089a2b13d5cdba9eee1287aad93f9 Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2
2017-05-05Prepare for removal of junit and android.test classes from Android API (step 1)Paul Duffin1-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: I743f9e20e1e60836ceba9b9051fa17835deba3a2
2017-05-05Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: Ie0f5e63446535e0c8ab8652faafc100deeb4b43a Auto-generated-cl: translation import
2017-05-04Import translations. DO NOT MERGEBill Yi1-2/+2
Change-Id: I70ca2d22462fff5fade98a1cb96db5ec6d3a0f7b Auto-generated-cl: translation import
2017-05-01Import translations. DO NOT MERGEThe Android Open Source Project3-3/+3
Change-Id: I18120d8f7deddfbf5f6558fc3c0afeddae95017e Auto-generated-cl: translation import
2017-05-01Import translations. DO NOT MERGEThe Android Open Source Project2-2/+2
Change-Id: I3434bfd7ac54492d1f422e43538381b9f1e65fdf Auto-generated-cl: translation import
2017-04-28Import translations. DO NOT MERGEBill Yi11-18/+18
Change-Id: I94f1f0ce565431c31168934cb683a69c1bd56125 Auto-generated-cl: translation import
2017-04-28Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I0f815e53170075785b3630f1c524be0e99155483 Auto-generated-cl: translation import
2017-04-28Import translations. DO NOT MERGEBill Yi1-2/+2
Change-Id: I4df7d6c7347ed92a38fd175c46076994b017223b Auto-generated-cl: translation import
2017-04-28Import translations. DO NOT MERGEBill Yi1-2/+2
Change-Id: I0a55a7e4beabfbc1b9810e315112418b3860ab46 Auto-generated-cl: translation import
2017-04-28Import translations. DO NOT MERGEBill Yi14-33/+33
Change-Id: Ide2d46f805a5bb36b32d6ebaec8d987973b816ab Auto-generated-cl: translation import
2017-04-28Import translations. DO NOT MERGEBill Yi2-2/+2
Change-Id: I98560e277103ff606353cff46889ecdb4d7a3b86 Auto-generated-cl: translation import
2017-04-28Import translations. DO NOT MERGEBill Yi4-6/+6
Change-Id: I19cf3418e3bb56a10729741b0d7514533a92f6be Auto-generated-cl: translation import
2017-04-28Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I13becab3eb65dbb5466387d2781af7226f8dee0e Auto-generated-cl: translation import
2017-04-28Import translations. DO NOT MERGEBill Yi1-2/+2
Change-Id: Ib3dc9dfc6748012de4882a5421993b7bbe825deb Auto-generated-cl: translation import
2017-04-26Use AAPT2Alan Viverette1-1/+6
Test: make checkbuild Change-Id: I8478dd61a2edf8f87437276025ed57092c1b047c
2017-04-26Import translations. DO NOT MERGEBill Yi4-15/+15
Change-Id: Ia60d6804e3876eaddb40917b121aade6dfe7c2f4 Auto-generated-cl: translation import
2017-04-26Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I486ef948c2cc221a5f1e3efe6fff0796e2a2c027 Auto-generated-cl: translation import
2017-04-26Import translations. DO NOT MERGEBill Yi1-2/+2
Change-Id: I6a8ca9b5d1f86a04302024cf2afaa270e330f908 Auto-generated-cl: translation import
2017-04-26Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I816a54997c43216b469b1a61bfddc744d08bf119 Auto-generated-cl: translation import
2017-04-20Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I3329d221b759894fa4c8e4a579b77f96c1771157 Auto-generated-cl: translation import
2017-04-12Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I8c58732d3929a9a7a52b1be4f9bd53c527c77d98 Auto-generated-cl: translation import
2017-04-10Import translations. DO NOT MERGEBill Yi2-2/+2
Change-Id: Ia6a62ea85b0a61cf94e4dbe20bddcb5aa0e99eba Auto-generated-cl: translation import
2017-04-10Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I57c2a9e284ad880ee56a8d40bf88a02a74554069 Auto-generated-cl: translation import
2017-04-07Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I7bac04e739211ba2f0a08d8fece298559924e770 Auto-generated-cl: translation import
2017-04-02Import translations. DO NOT MERGEBill Yi77-823/+824
Auto-generated-cl: translation import Bug: 36832302 Change-Id: I33c7a3e55084f5f827b1833fed0142e800a38950
2017-04-02Import translations. DO NOT MERGEBill Yi12-18/+18
Auto-generated-cl: translation import Bug: 36832302 Change-Id: I6b9237cb556259ed9803ae1bef977d284d93d618
2017-04-02Import translations. DO NOT MERGEBill Yi2-17/+17
Auto-generated-cl: translation import Bug: 36832302 Change-Id: I383339746de9527c4a03e2e73697771f9c2310da
2017-04-02Import translations. DO NOT MERGEBill Yi23-52/+52
Auto-generated-cl: translation import Bug: 36832302 Change-Id: I6f0c71c1cf7d5fda940bcc2a164ccef590d1db4d
2017-04-02Import translations. DO NOT MERGEBill Yi1-1/+1
Auto-generated-cl: translation import Bug: 36832302 Change-Id: Ia1da75e3245c7fd496cf2874661b52a32ca24fd1
2017-04-02Import translations. DO NOT MERGEBill Yi1-2/+2
Auto-generated-cl: translation import Bug: 36832302 Change-Id: I445089565caa6c65a090b8f09a6b6502c32c2de0
2017-04-02Import translations. DO NOT MERGEBill Yi4-4/+4
Auto-generated-cl: translation import Bug: 36832302 Change-Id: I1982e54320535710dbdc834c27ef2d1fa8943d2b