Commit Graph

40158 Commits (4535888bfe9761105dae83a97dd27597c9a18746)

Author SHA1 Message Date
Bill Yi 4535888bfe Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 -s ours am: 9467382a44 -s ours am: 2e2dfc94fc -s ours
am: b68b01872a  -s ours

Change-Id: I7e37986af29b210c35633c9c2f126b4629d99fbf
2017-07-27 02:18:43 +00:00
Bill Yi 0afbf0f6df Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 -s ours am: 9467382a44 -s ours am: 4a6a014605 -s ours
am: 788000450f  -s ours

Change-Id: I21ac0dd5be2a6a3e510297fd9509847339e2b094
2017-07-27 02:18:30 +00:00
Bill Yi e3f0231a8f Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 -s ours am: 9467382a44 -s ours am: 4a6a014605 -s ours
am: 80ef755c2c  -s ours

Change-Id: I7853b039065f51aa16305b9c7affea4fc4878e18
2017-07-27 02:05:59 +00:00
Bill Yi 80ef755c2c Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 -s ours am: 9467382a44 -s ours
am: 4a6a014605  -s ours

Change-Id: I94fa00db6bb4546397583fb22681dcc5dd0a9c3c
2017-07-27 01:25:57 +00:00
Bill Yi b68b01872a Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 -s ours am: 9467382a44 -s ours
am: 2e2dfc94fc  -s ours

Change-Id: I7cec44bded9fcfe5267265a95986a228c6af6fd7
2017-07-27 01:25:20 +00:00
Bill Yi 788000450f Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 -s ours am: 9467382a44 -s ours
am: 4a6a014605  -s ours

Change-Id: I7b16e3b03f740fc5004331e0f4de2ecdc8817c51
2017-07-27 01:20:49 +00:00
Bill Yi 2e2dfc94fc Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 -s ours
am: 9467382a44  -s ours

Change-Id: I79e5a199e94ac635f0b8b8b6eaea3d3b4c98457f
2017-07-27 00:56:56 +00:00
Bill Yi 4a6a014605 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 -s ours
am: 9467382a44  -s ours

Change-Id: I33d15a705ef8eabba215efb59a4b583111b34265
2017-07-27 00:56:55 +00:00
Bill Yi 9467382a44 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 01422e1ff5  -s ours

Change-Id: I7745987e0e30d8bde20015409da01213fc8903d8
2017-07-26 23:23:05 +00:00
Android Build Merger (Role) 22de4082c6 Merge "Import translations. DO NOT MERGE am: 03907bdaeb -s ours am: e688963174 -s ours am: c3e81eb7d2 -s ours am: c813e90ef2 -s ours" into oc-mr1-dev-plus-aosp 2017-07-26 22:27:12 +00:00
Bill Yi e1b70b181a Import translations. DO NOT MERGE am: 03907bdaeb -s ours am: e688963174 -s ours am: c3e81eb7d2 -s ours
am: c813e90ef2  -s ours

Change-Id: I857ad147df80bff7cd328e6617a9122cf3f4bf72
2017-07-26 22:27:00 +00:00
Bill Yi e99bc95d58 Import translations. DO NOT MERGE am: 03907bdaeb -s ours am: e688963174 -s ours am: c3e81eb7d2 -s ours
am: 557bfe57d5  -s ours

Change-Id: I1d293852fd63267a39ecc3db9262360170ecdd2a
2017-07-26 22:26:52 +00:00
Bill Yi 48e760f74d Import translations. DO NOT MERGE am: 03907bdaeb -s ours am: e688963174 -s ours am: 301645fdf5 -s ours
am: 216737e6f7  -s ours

Change-Id: I417d34faca45e16b76bbe5e16dd94be9f389cf9d
2017-07-26 22:26:39 +00:00
Bill Yi 557bfe57d5 Import translations. DO NOT MERGE am: 03907bdaeb -s ours am: e688963174 -s ours
am: c3e81eb7d2  -s ours

Change-Id: Id81ef6e92fa0eaebc8d49dc0249d2d133ff3ee4e
2017-07-26 22:16:44 +00:00
Bill Yi 216737e6f7 Import translations. DO NOT MERGE am: 03907bdaeb -s ours am: e688963174 -s ours
am: 301645fdf5  -s ours

Change-Id: I793d44610630bb016868da8f99fa413dd68cd458
2017-07-26 22:09:59 +00:00
Bill Yi c813e90ef2 Import translations. DO NOT MERGE am: 03907bdaeb -s ours am: e688963174 -s ours
am: c3e81eb7d2  -s ours

Change-Id: I0d4709ec6d29fab716e560b3699784f8cc2fc2ba
2017-07-26 22:09:38 +00:00
Bill Yi c3e81eb7d2 Import translations. DO NOT MERGE am: 03907bdaeb -s ours
am: e688963174  -s ours

Change-Id: Icd0cd7480d2692272c8ddebd6e8fb94d1bb0fcc9
2017-07-26 22:03:00 +00:00
Bill Yi 301645fdf5 Import translations. DO NOT MERGE am: 03907bdaeb -s ours
am: e688963174  -s ours

Change-Id: Ib8cf3c801dbb33ba99cbe8dd38e1f0d0dcc56b4f
2017-07-26 22:02:58 +00:00
TreeHugger Robot 01422e1ff5 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-07-26 22:01:56 +00:00
Bill Yi e688963174 Import translations. DO NOT MERGE
am: 03907bdaeb  -s ours

Change-Id: I5a88544c53e5411b1234bd5fad0c1408141a62ec
2017-07-26 21:56:09 +00:00
Dan Willemsen da16b03b60 Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9 am: 5977a3cb18 am: 5c223f1b0b
am: ef9a07958f

Change-Id: I8a6fa664e6e1ef439b02ac22883318a1f328a4e7
2017-07-26 21:03:43 +00:00
Dan Willemsen ef9a07958f Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9 am: 5977a3cb18
am: 5c223f1b0b

Change-Id: I1e2f47b4cbedc7d1a49c33620d0ac4feba97c29f
2017-07-26 20:49:55 +00:00
Dan Willemsen 5c223f1b0b Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9
am: 5977a3cb18

Change-Id: I5b60ba77c77a8e635cfc1f495f07b217eb486cee
2017-07-26 20:45:56 +00:00
Dan Willemsen 5977a3cb18 Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION"
am: 3669fbc4c9

Change-Id: Ibfbc1f11eac0870a5eec7211c868fdcb38f395e0
2017-07-26 20:42:35 +00:00
Treehugger Robot 3669fbc4c9 Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" 2017-07-26 20:26:31 +00:00
Bill Yi 03907bdaeb Import translations. DO NOT MERGE
Change-Id: I83d6d6794644e7bf00bcd3e9d24f801dd0f26ec7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 11:28:31 -07:00
Bill Yi cd23c7560e Import translations. DO NOT MERGE
Change-Id: Ie2ee3d601e39084145911761b1204e5f4cafd219
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 11:28:18 -07:00
Dan Willemsen 6e29475b9f 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
2017-07-26 10:59:15 -07:00
Bill Yi b5498e2540 Import translations. DO NOT MERGE am: 3025a229ba -s ours
am: 52aaa5c2f4  -s ours

Change-Id: Iefe17ee238c1c0a9b3a3ff7646be0bb94cb21905
2017-07-26 17:49:26 +00:00
Bill Yi ed6a928aff Import translations. DO NOT MERGE am: 3025a229ba -s ours
am: 6f90d21def  -s ours

Change-Id: I192a3671bd5aee886b67214c184994fada106ac4
2017-07-26 17:26:46 +00:00
Bill Yi 6f90d21def Import translations. DO NOT MERGE
am: 3025a229ba  -s ours

Change-Id: I1b240370982c3797a2db5797c0c04edddb098ed0
2017-07-26 17:06:01 +00:00
Bill Yi 52aaa5c2f4 Import translations. DO NOT MERGE
am: 3025a229ba  -s ours

Change-Id: I0114dbd71207827cabebdfe251cf55ef32d6ce1e
2017-07-26 17:04:29 +00:00
Bill Yi 3025a229ba Import translations. DO NOT MERGE
Change-Id: Ib4e62fdb016fe7a1bf1af921ca278c6163e7da01
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 07:29:34 -07:00
Bill Yi 3385da1f20 Import translations. DO NOT MERGE
Change-Id: I93dd89f9cd29db52a2660b162a2c00959dc040d2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-13 05:38:14 -07:00
Bill Yi d677f30367 Import translations. DO NOT MERGE
Change-Id: I5ee735229f2f06ddf12332496d7cc4d27c4bb87c
Auto-generated-cl: translation import
2017-06-27 00:41:00 -07:00
Bill Yi 862dafaa6a Import translations. DO NOT MERGE
Change-Id: I9670b44e5df11ebb9b81a31afff8f5167e178057
Auto-generated-cl: translation import
2017-06-22 16:17:10 -07:00
TreeHugger Robot 59716cb47a Merge "Import translations. DO NOT MERGE" 2017-06-21 20:12:51 +00:00
TreeHugger Robot 6746323540 Merge "Import translations. DO NOT MERGE" 2017-06-21 19:48:32 +00:00
Bill Yi 1eb4270b38 Import translations. DO NOT MERGE
Change-Id: I67380e155bb7d31b62e7a429d01823d34b9c57cd
Auto-generated-cl: translation import
2017-06-20 23:11:54 -07:00
Bill Yi ee6a4fd1a1 Import translations. DO NOT MERGE
Change-Id: Ia8378e5bcb82aafaf51d0e877a14b83c46f21fe1
Auto-generated-cl: translation import
2017-06-20 22:59:37 -07:00
Bill Yi bb0320d466 Import translations. DO NOT MERGE
Change-Id: Ia1ba3afca4c2e76f073d9f0fbe4b1cb317eadd59
Auto-generated-cl: translation import
2017-06-20 22:51:42 -07:00
Paul Duffin f339af6018 Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a8df am: c44dd5a879 -s ours am: dec3c3d02b -s ours
am: da238095c9  -s ours

Change-Id: I4f8cf81dd24b1c21efb52a166eea70abd1dd8785
2017-06-15 05:34:52 +00:00
Paul Duffin da238095c9 Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a8df am: c44dd5a879 -s ours
am: dec3c3d02b  -s ours

Change-Id: Ief9ddd7f24e1b921e9905cc334780e45b9f67218
2017-06-15 05:25:20 +00:00
Paul Duffin dec3c3d02b Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a8df
am: c44dd5a879  -s ours

Change-Id: I08f18c4bf6f373548509882f55d1161b35fc752a
2017-06-15 05:17:32 +00:00
Paul Duffin c44dd5a879 Merge "Fix dependencies of packages that target earlier releases"
am: bde4c9a8df

Change-Id: I24ee27f2d99de7cee6aace00b3d721cd91fff3d4
2017-06-15 05:15:01 +00:00
Paul Duffin bde4c9a8df Merge "Fix dependencies of packages that target earlier releases" 2017-06-15 05:09:45 +00:00
Paul Duffin b2c5f21750 Fix dependencies of packages that target earlier releases am: 6767e05934
am: 6736fb2967

Change-Id: Ie2bfb2e0c422e7a7e2f9cf96ba38e989d0c3c8a9
2017-06-14 18:21:09 +00:00
Paul Duffin 6736fb2967 Fix dependencies of packages that target earlier releases
am: 6767e05934

Change-Id: I84712a036ee5e2b2eda093f6eda614acc34c4bba
2017-06-14 18:11:34 +00:00
Paul Duffin 76ae487e59 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
2017-06-14 18:56:49 +01:00
Paul Duffin 6767e05934 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
2017-06-13 16:13:10 +01:00