Commit Graph

40701 Commits (cfb0e05e0398035d75ab06bfb8298d9e061ec9e1)

Author SHA1 Message Date
Bill Yi 6b7423b2a0 Import translations. DO NOT MERGE
am: 5b4b6457d9  -s ours

Change-Id: I05eafbac66243bae4a2f9af4616777df2891dd95
2017-12-21 17:46:47 +00:00
Bill Yi d77d71b7a5 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: e43661faae  -s ours

Change-Id: Ia76c9bf7502f13860eeb8906933544b365073749
2017-12-20 20:38:42 +00:00
Bill Yi 3ab5fd5619 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 86496c0a8e  -s ours

Change-Id: I253736c317d8d119b34db89cca6df7d62f84afc8
2017-12-20 20:38:25 +00:00
Bill Yi e052b904d3 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 1d4e1aadbc  -s ours

Change-Id: I6e203b49328a8ad3dccde04b12494a7fd7f2620d
2017-12-20 20:38:09 +00:00
Bill Yi dd70db430a Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: d626e07492  -s ours

Change-Id: I44e62e4825b52be0ec277f1b77421cd4997bb2f9
2017-12-20 20:37:53 +00:00
Bill Yi 7659c56784 Import translations. DO NOT MERGE
am: 7f39ff785e  -s ours

Change-Id: I91b2fc3c61e368f28e48dd3108fedd399d1e7d49
2017-12-20 20:37:32 +00:00
TreeHugger Robot ce7d21ad2e Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-12-20 20:21:01 +00:00
TreeHugger Robot da3b9b9752 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-12-20 20:15:24 +00:00
TreeHugger Robot 0149f480f6 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-12-20 20:14:56 +00:00
TreeHugger Robot 82f6b2d105 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-12-20 20:13:41 +00:00
TreeHugger Robot e43661faae Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-12-20 20:06:48 +00:00
TreeHugger Robot 86496c0a8e Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-12-20 19:57:45 +00:00
TreeHugger Robot 1d4e1aadbc Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-12-20 19:55:13 +00:00
TreeHugger Robot d626e07492 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-12-20 19:54:29 +00:00
TreeHugger Robot beae30c4e8 Merge "Import translations. DO NOT MERGE" 2017-12-20 19:33:57 +00:00
TreeHugger Robot fd2574bda4 Merge "Import translations. DO NOT MERGE" 2017-12-20 19:22:45 +00:00
Bill Yi b48a279124 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I3d75a28014c36d61c21c48c33eccddc2a753a78d
2017-12-19 18:22:13 -08:00
Bill Yi 5b4b6457d9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I69f3689d113dbb5fdc5bf4b5fe538d24c2aeeb0a
2017-12-19 18:11:43 -08:00
Bill Yi f435ce79ae Import translations. DO NOT MERGE
Change-Id: I265c7babd1e0f3d6ed7dc9ddf7779f770520cca5
Auto-generated-cl: translation import
2017-12-19 18:01:17 -08:00
Bill Yi 7f39ff785e Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If8517d5669dde19ce47805286ebdf9a330960892
2017-12-19 17:48:13 -08:00
Bill Yi bbf61fc5d6 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I62e324677b8c212ff4b94ccfa46102a8971ad39e
2017-12-19 17:47:37 -08:00
Bill Yi f9d361dcd8 Import translations. DO NOT MERGE
Change-Id: I47cd7bc7be3a009b204ecd509b98577d5a07ee38
Auto-generated-cl: translation import
2017-12-19 17:47:00 -08:00
Bill Yi 2bf06e5c50 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9cd6184f5b9a65b84a46d2bb271b536237fa8f44
2017-12-19 17:43:45 -08:00
Bill Yi 96357bd31e Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I23df49c7d77697a168da5c2d1201078582349eab
2017-12-19 17:43:06 -08:00
Bill Yi 880763fb04 Import translations. DO NOT MERGE
Change-Id: Id98113aaa443c1107240b4002a35a8d9e1ea129b
Auto-generated-cl: translation import
2017-12-19 17:42:24 -08:00
Bill Yi c44d798e7e Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I109194df374b25260a047bf0e5b3993edfa9275a
2017-12-19 17:40:34 -08:00
Bill Yi 8139573ff0 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I4c5f3c11ba98c1ee0dc4ad110ddf8f92eb13ac75
2017-12-19 17:39:26 -08:00
Bill Yi 4798b39caa Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I79026cc9df0e25bc2417dd20eed3031a46a238e8
2017-12-19 17:34:39 -08:00
Bill Yi 87d2226e3b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I118125d24857d4aae99800775c0456ee94c56676
2017-12-19 17:33:50 -08:00
Paul Duffin 8a45a970ab Add android.test.base/stubs dependency
In preparation for the removal of the non-junit classes in the
android.test.base library from the android.jar this adds a dependency
on android.test.base/stubs to ensure this code will continue to
compile.

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
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    LatinIMETests's will need them in order to compile once its classes
    are removed from the current SDK on which it currently depends.

Bug: 30188076
Test: make dist
Change-Id: I9f2244d4b5711620dc02dd24dc407807d726480e
2017-12-15 07:22:38 +00:00
Colin Cross fc55b74b57 Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" am: 87c6fcf126 am: 88f12fdcce
am: d373b6c4a5  -s ours

Change-Id: I86e0ae275098b662783ca97b9a73bbcd80cac611
2017-12-13 01:58:08 +00:00
Colin Cross d373b6c4a5 Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" am: 87c6fcf126
am: 88f12fdcce

Change-Id: I4ffe046c3b332cd065ba5735f23e19b8d067ac6b
2017-12-13 01:44:36 +00:00
Colin Cross 88f12fdcce Merge "Use a.t.mock.stubs instead of a.t.mock.sdk"
am: 87c6fcf126

Change-Id: Iaf8222d9bde062ebd6a75a610961b518a2fd65ca
2017-12-13 01:12:43 +00:00
Colin Cross 87c6fcf126 Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" 2017-12-12 23:26:41 +00:00
TreeHugger Robot 48011de49f Merge "Import translations. DO NOT MERGE" 2017-12-08 20:00:11 +00:00
TreeHugger Robot a97cfc272a Merge "Import translations. DO NOT MERGE" 2017-12-08 05:29:23 +00:00
Xin Li 913ab6557d Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d8a341b914 -s ours am: 6819b9691a
am: 55cf499d38  -s ours

Change-Id: I01d1445d4d5bedb92c343a464d0af9c21b1df3cd
2017-12-08 04:40:23 +00:00
Bill Yi 3d21834741 Import translations. DO NOT MERGE
Change-Id: I1fb69251a612e2f064b418a651e5c679aeb6f528
Auto-generated-cl: translation import
2017-12-07 17:02:42 -08:00
Bill Yi 4d9d9b3224 Import translations. DO NOT MERGE
Change-Id: I23bdefa3861b985df5f0cec0cfc84e85df449e58
Auto-generated-cl: translation import
2017-12-07 17:02:31 -08:00
Stephen Li aa43373fb8 Manually merge changes from giant AOSP topic
Change-Id: Ib64f9a5480b83acb2ef855d5c45a7defcdd5be8a
2017-12-07 23:29:32 +00:00
Paul Duffin 85c065986f Use a.t.mock.stubs instead of a.t.mock.sdk
Remove dependencies on android.test.mock.sdk as it is a duplicate of
android.test.mock.stubs and will be removed.

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
    Replaced 'android.test.mock.sdk' with 'android.test.mock.stubs' in
    LOCAL_JAVA_LIBRARIES because android.test.mock.sdk has been
    deprecated.

Bug: 30188076
Test: make checkbuild
Change-Id: I50a306c3bb80a9d7cdf2d19744734f304abf3bd1
Merged-In: I50a306c3bb80a9d7cdf2d19744734f304abf3bd1
(cherry picked from commit 097130d198)
2017-12-07 13:34:41 -08:00
Xin Li 55cf499d38 Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d8a341b914 -s ours
am: 6819b9691a

Change-Id: Icafe49b5f116100b493ee86c0b1504f000d4210a
2017-12-07 15:39:59 +00:00
Xin Li 6819b9691a Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: d8a341b914  -s ours

Change-Id: I6553c89a7d7267cc2298572fd09d64202cffd858
2017-12-07 15:34:01 +00:00
Xin Li 7278f39f05 DO NOT MERGE: Merge Oreo MR1 into master am: f630b9d122 -s ours
am: be28cec210

Change-Id: Ide80325d76a65ff630b2583cc3a816820a2cd054
2017-12-07 07:08:24 +00:00
Xin Li be28cec210 DO NOT MERGE: Merge Oreo MR1 into master
am: f630b9d122  -s ours

Change-Id: Idadf26f4ef05cfbcf9b6f8b74d12d1e1ee28e017
2017-12-07 04:39:13 +00:00
Xin Li d8a341b914 Merge "DO NOT MERGE: Merge Oreo MR1 into master" 2017-12-06 23:18:26 +00:00
Xin Li f630b9d122 DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ib1ef5bebfccf8eab11bb080c0e13cdf4cff9e79e
2017-12-06 14:24:54 -08:00
Paul Duffin 2ccdf50ae2 Flatten dependency hierarchy of legacy-android-test
Previous changes statically included legacy-android-test in preparation
for removing android.test.* and junit.* classes from the android.jar.
Unfortunately, that lead to duplicate classes between APKs and the
bootclasspath which caused build problems (Proguard) and also runtime
problems (when targeting and running on older releases).

Switching from statically including the classes to using the runtime
libraries cannot be done in one step because legacy-android-test is
statically included in libraries which are used in many APKs and so
removing it from those libraries requires that all APKs be updated at
once. Doing that atomically across dozens of projects is not practical.

This change modifies APKS that statically include the
legacy-android-test library indirectly.

* If the APK manifest uses the android.test.runner library then the APK
  is modified to stop statically including legacy-android-test and
  instead build against android.test.base/mock/runner libraries instead.

* Otherwise, the APK statically includes legacy-android-test.

Also, any libraries that statically include are modified to stop
statically including it and if it has source dependencies on the classes
is changed to build against the android.test.base/mock/runner libraries.

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
    Replaced 'legacy-android-test' with 'android.test.runner.stubs' in
    LOCAL_JAVA_LIBRARIES because LatinIMETests's source depends on its
    classes. The classes do not need to be statically included because
    the classes will be provided by the runtime, either from the
    default bootclasspath or from the android.test.runner library that
    LatinIMETests specifies in its manifest.

Bug: 30188076
Test: make checkbuild
Change-Id: I3c70889b35d402626f79c986771b9c2ea8823b8a
2017-12-05 18:36:57 +00:00
TreeHugger Robot 17b2ad33b3 Merge "Import translations. DO NOT MERGE" 2017-12-01 08:38:30 +00:00
TreeHugger Robot e3b9274f72 Merge "Import translations. DO NOT MERGE" 2017-12-01 08:31:24 +00:00