aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Import translations. DO NOT MERGE am: 03907bdaeb -s ours am: e688963174 -s ↵Bill Yi2017-07-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 301645fdf5 -s ours am: 216737e6f7 -s ours am: 48e760f74d -s ours Change-Id: Icb3fe3f34dd40d91dd5fb0d7b0fbd24cca71b752
| * | | | | | | | | Import translations. DO NOT MERGE am: 03907bdaeb -s ours am: e688963174 -s ↵Bill Yi2017-07-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 301645fdf5 -s ours am: 216737e6f7 -s ours Change-Id: I417d34faca45e16b76bbe5e16dd94be9f389cf9d
| | * | | | | | | | Import translations. DO NOT MERGE am: 03907bdaeb -s ours am: e688963174 -s ↵Bill Yi2017-07-260-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 301645fdf5 -s ours Change-Id: I793d44610630bb016868da8f99fa413dd68cd458
| | | * | | | | | | Import translations. DO NOT MERGE am: 03907bdaeb -s oursBill Yi2017-07-260-0/+0
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e688963174 -s ours Change-Id: Ib8cf3c801dbb33ba99cbe8dd38e1f0d0dcc56b4f
| | | | * | | | | | Import translations. DO NOT MERGEBill Yi2017-07-260-0/+0
| | | | |\ \ \ \ \ \ | | | | | | |_|/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 03907bdaeb -s ours Change-Id: I5a88544c53e5411b1234bd5fad0c1408141a62ec
| | | | | * | | | | Import translations. DO NOT MERGEBill Yi2017-07-264-8/+8
| | | | | | |_|/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I83d6d6794644e7bf00bcd3e9d24f801dd0f26ec7 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | | | | | | | | Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9 ↵Dan Willemsen2017-07-262-19/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5977a3cb18 am: 5c223f1b0b am: ef9a07958f am: da16b03b60 Change-Id: I31fd1fd8fb78cc8ea1516e1e309b654c68f1fc69
| * | | | | | | | Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9 ↵Dan Willemsen2017-07-262-19/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5977a3cb18 am: 5c223f1b0b am: ef9a07958f Change-Id: I8a6fa664e6e1ef439b02ac22883318a1f328a4e7
| | * | | | | | | Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9 ↵Dan Willemsen2017-07-262-19/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5977a3cb18 am: 5c223f1b0b Change-Id: I1e2f47b4cbedc7d1a49c33620d0ac4feba97c29f
| | | * | | | | | Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9Dan Willemsen2017-07-262-19/+0
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5977a3cb18 Change-Id: I5b60ba77c77a8e635cfc1f495f07b217eb486cee
| | | | * | | | | Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION"Dan Willemsen2017-07-262-19/+0
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3669fbc4c9 Change-Id: Ibfbc1f11eac0870a5eec7211c868fdcb38f395e0
| | | | * | | | | Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION"Treehugger Robot2017-07-262-19/+0
| | | | |\ \ \ \ \
| | | | | * | | | | Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSIONDan Willemsen2017-07-262-19/+0
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Import translations. DO NOT MERGE am: 3025a229ba -s ours am: 52aaa5c2f4 -s ↵Bill Yi2017-07-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: b5498e2540 -s ours Change-Id: I8f77675272034c6566ce3b0cda70167fe37ef289
| * | | | | | | | Import translations. DO NOT MERGE am: 3025a229ba -s oursBill Yi2017-07-260-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 52aaa5c2f4 -s ours Change-Id: Iefe17ee238c1c0a9b3a3ff7646be0bb94cb21905
| | * | | | | | | Import translations. DO NOT MERGEBill Yi2017-07-260-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3025a229ba -s ours Change-Id: I0114dbd71207827cabebdfe251cf55ef32d6ce1e
* | | | | | | | | Import translations. DO NOT MERGE am: 3025a229ba -s ours am: 6f90d21def -s ↵Bill Yi2017-07-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: ed6a928aff -s ours Change-Id: I53443326197e4184c67751e0c535ea06f1d0fffb
| * | | | | | | | Import translations. DO NOT MERGE am: 3025a229ba -s oursBill Yi2017-07-260-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | | | | | | | | am: 6f90d21def -s ours Change-Id: I192a3671bd5aee886b67214c184994fada106ac4
| | * | | | | | Import translations. DO NOT MERGEBill Yi2017-07-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3025a229ba -s ours Change-Id: I1b240370982c3797a2db5797c0c04edddb098ed0
| | | * | | | | Import translations. DO NOT MERGEBill Yi2017-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib4e62fdb016fe7a1bf1af921ca278c6163e7da01 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | | | | | | | Import translations. DO NOT MERGEBill Yi2017-07-191-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I488bc50df2eb0e76171bcecd41717c28ffb4e56c Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | | | | | | Import translations. DO NOT MERGEBill Yi2017-07-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I93dd89f9cd29db52a2660b162a2c00959dc040d2 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | | | | | | Import translations. DO NOT MERGEBill Yi2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5ee735229f2f06ddf12332496d7cc4d27c4bb87c Auto-generated-cl: translation import
* | | | | | | Import translations. DO NOT MERGEBill Yi2017-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9670b44e5df11ebb9b81a31afff8f5167e178057 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-06-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBill Yi2017-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8378e5bcb82aafaf51d0e877a14b83c46f21fe1 Auto-generated-cl: translation import
* | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-06-211-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \