aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGE am: 03907bdaeb -s ours am: e688963174 -s ...•••am: 301645fdf5 -s ours Change-Id: I793d44610630bb016868da8f99fa413dd68cd458 Bill Yi2017-07-260-0/+0
|\
| * Import translations. DO NOT MERGE am: 03907bdaeb -s ours•••am: e688963174 -s ours Change-Id: Ib8cf3c801dbb33ba99cbe8dd38e1f0d0dcc56b4f Bill Yi2017-07-260-0/+0
| |\
| | * Import translations. DO NOT MERGE•••am: 03907bdaeb -s ours Change-Id: I5a88544c53e5411b1234bd5fad0c1408141a62ec Bill Yi2017-07-260-0/+0
| | |\
| | | * Import translations. DO NOT MERGE•••Change-Id: I83d6d6794644e7bf00bcd3e9d24f801dd0f26ec7 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bill Yi2017-07-264-8/+8
* | | | Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9 a...•••am: 5c223f1b0b Change-Id: I1e2f47b4cbedc7d1a49c33620d0ac4feba97c29f Dan Willemsen2017-07-262-19/+0
|\| | |
| * | | Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9•••am: 5977a3cb18 Change-Id: I5b60ba77c77a8e635cfc1f495f07b217eb486cee Dan Willemsen2017-07-262-19/+0
| |\ \ \
| | * | | Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION"•••am: 3669fbc4c9 Change-Id: Ibfbc1f11eac0870a5eec7211c868fdcb38f395e0 Dan Willemsen2017-07-262-19/+0
| |/| | |
| | * | | Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION"Treehugger Robot2017-07-262-19/+0
| | |\ \ \
| | | * | | Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION•••This builds on Darwin fine, so remove the non-standard darwin checks. Remove HOST_JDK_IS_64BIT_VERSION, it's always true now, and this is the only user. Test: mmm packages/inputmethods/LatinIME/tools/dicttool:liblatinime-aosp-dicttool-host Change-Id: I750c6baa29cf1d27a885ff064f0daf9d986db0b9 Dan Willemsen2017-07-262-19/+0
| | |/ / /
* | | | | Import translations. DO NOT MERGE•••am: 3025a229ba -s ours Change-Id: I1b240370982c3797a2db5797c0c04edddb098ed0 Bill Yi2017-07-260-0/+0
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGE•••Change-Id: Ib4e62fdb016fe7a1bf1af921ca278c6163e7da01 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bill Yi2017-07-261-1/+1
* | | | | | Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a...•••am: dec3c3d02b -s ours Change-Id: Ief9ddd7f24e1b921e9905cc334780e45b9f67218 Paul Duffin2017-06-150-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a8df•••am: c44dd5a879 -s ours Change-Id: I08f18c4bf6f373548509882f55d1161b35fc752a Paul Duffin2017-06-150-0/+0
| |\ \ \ \ \
| | * \ \ \ \ 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
| | | |/ / / /
* | | | / / / Fix dependencies of packages that target earlier releases•••am: 6767e05934 Change-Id: I84712a036ee5e2b2eda093f6eda614acc34c4bba Paul Duffin2017-06-141-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: Icab8a4c4801536f112e29dfd2dc66be8b90b811d Paul Duffin2017-06-131-2/+3
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-311-1/+1
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGE•••Change-Id: I8f7f8dd206a91c73781fbcf24900a631f90f3474 Auto-generated-cl: translation import Bill Yi2017-05-311-1/+1
* | | | | | | Import translations. DO NOT MERGE•••Change-Id: I7bc939b0a283fe72d730e9ad0084e1ffa4bd50db Auto-generated-cl: translation import Bill Yi2017-05-311-1/+1
|/ / / / / /
* | | | | | Import translations. DO NOT MERGE•••Change-Id: Ib413b1988ad8828fdd42b34e9a2ad26c6237ce5a Auto-generated-cl: translation import Bill Yi2017-05-222-4/+4
* | | | | | Merge "Revert "Revert "Use AAPT2""" into oc-dev am: e6cfc2ff63•••am: e777c7bdc7 Change-Id: Ibf41dc758b32f4b4f0398c5013ad6d3899743f49 Adam Lesinski2017-05-191-1/+6
|\| | | | |
| * | | | | Merge "Revert "Revert "Use AAPT2""" into oc-dev•••am: e6cfc2ff63 Change-Id: I7634a7cedd45ee01facad8cc91316ce7cf1544eb Adam Lesinski2017-05-191-1/+6
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Revert "Revert "Use AAPT2""" into oc-devTreeHugger Robot2017-05-191-1/+6
| | |\ \ \ \
| | | * | | | Revert "Revert "Use AAPT2""•••This reverts commit af1177453d95d727651cf48a380d7979dc94ae45. Reason for revert: Bug in aapt2 was fixed b/38152130 Change-Id: I2701d67f581165d371a745749367c0c825168e22 Adam Lesinski2017-05-171-1/+6
* | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-163-11/+11
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGE•••Change-Id: I433c4b65242ec711f0198a52e3041e8e2449f8cc Auto-generated-cl: translation import Bill Yi2017-05-163-11/+11
* | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGE•••Change-Id: I59054386d3666143821916c57c3ce9b6cbb3aaa1 Auto-generated-cl: translation import Bill Yi2017-05-161-1/+1
| |/ / / / / / /
* | | | | | | | Merge "Revert "Use AAPT2"" into oc-dev am: 3ac57504cd•••am: 811b5295df Change-Id: Ifbf1782b7c55f7414b29215711c9cb08b69dd256 Alan Viverette2017-05-161-6/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Merge "Revert "Use AAPT2"" into oc-dev•••am: 3ac57504cd Change-Id: I45cb9a9ecfe5d273a2bfd56463c7a7ada868bf67 Alan Viverette2017-05-161-6/+1
| |\| | | | |
| | * | | | | Merge "Revert "Use AAPT2"" into oc-devTreeHugger Robot2017-05-161-6/+1
| | |\| | | |
| | | * | | | Revert "Use AAPT2"•••This reverts commit 0f6f5c017629befcc4b8d9f1111e18d3505bfac1. Change-Id: Ibba7d35846cdbf6086877fd2859c2e2c91dcf2ee Alan Viverette2017-05-151-6/+1
* | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-115-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGE•••Change-Id: I5ff5d90c163bfb05bd4d8db583ed1deee5d844c4 Auto-generated-cl: translation import Bill Yi2017-05-115-6/+6
* | | | | | | | Import translations. DO NOT MERGE•••Change-Id: Ifc3bd3ad01d6dc66711756664a51f1340cc8221b Auto-generated-cl: translation import Bill Yi2017-05-111-1/+1
|/ / / / / / /
* | | | | | | Merge "Prepare for removal of junit and android.test classes from Android API...•••am: 28f867d780 -s ours Change-Id: Ifacc5fa99c5bf427504a6a8a8c71e57e251624b7 Paul Duffin2017-05-110-0/+0
|\| | | | | |
| * | | | | | Merge "Prepare for removal of junit and android.test classes from Android API...Paul Duffin2017-05-111-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: Icf844999082db141cffcb099aa4004afc7a7c749 Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2 Paul Duffin2017-05-101-1/+4
* | | | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev am: add95c01b9 -s ours•••am: 4d3b0f119f -s ours Change-Id: Ib7dcfe1de90c6c25fd1bd59cf1261714152d64c6 Bill Yi2017-05-110-0/+0
|\| | | | | | |
| * | | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev•••am: add95c01b9 -s ours Change-Id: If0a6f3ad7aede027d34bdce9ca6cceb7457ea210 Bill Yi2017-05-110-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-05-112-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | Import translations. DO NOT MERGE•••Change-Id: I79556fca866d6054a2327222d73809e93ba80185 Auto-generated-cl: translation import Bill Yi2017-05-102-2/+2
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev am: d20b8bd58d -s ours•••am: fd3a13903f -s ours Change-Id: I66a10ca46048c3bdf0f134b66d81352a238d52c5 Bill Yi2017-05-110-0/+0
|\| | | | | | | |
| * | | | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev•••am: d20b8bd58d -s ours Change-Id: Id10c6493693229151d15ddd872188ace68e73429 Bill Yi2017-05-110-0/+0
| |\| | | | | | |
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-05-113-4/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Import translations. DO NOT MERGE•••Change-Id: Id738f4b110ee27a2c18cf8ade15afe67e5b150f8 Auto-generated-cl: translation import Bill Yi2017-05-103-4/+4
| | | |/ / / / / /
* | | | | | | | | Import translations. DO NOT MERGE am: 99d1abb252 -s ours•••am: 7067b4a34f -s ours Change-Id: Ifd99a7bc781a8fa50be033aeef32e20711bb1440 Bill Yi2017-05-110-0/+0
|\| | | | | | | |
| * | | | | | | | Import translations. DO NOT MERGE•••am: 99d1abb252 -s ours Change-Id: I9c07e145ba5f24496df9cee2849e171496ab4697 Bill Yi2017-05-110-0/+0
| |\| | | | | | | | | |_|/ / / / / | |/| | | | | |