| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge "Import translations. DO NOT MERGE" into stage-aosp-master•••am: 3fdeef487f -s ours
Change-Id: I9b9d6c0eb0c4feeff169ad05c3f956870b828218
|   Bill Yi | 2017-08-07 | 0 | -0/+0 |
| |\ |
|
| | * | Merge "Import translations. DO NOT MERGE" into stage-aosp-master |   TreeHugger Robot | 2017-08-07 | 1 | -1/+1 |
| | |\ |
|
| | | * | Import translations. DO NOT MERGE•••Change-Id: I308e6ef94dbffe4df11934adff18eaee5101e42b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
| Bill Yi | 2017-08-06 | 1 | -1/+1 |
| * | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master•••am: f30d524d80 -s ours
Change-Id: I58c300deb1d7e316b4c422935d71692b0db00b13
| Bill Yi | 2017-08-07 | 0 | -0/+0 |
| |\| | |
|
| | * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master | TreeHugger Robot | 2017-08-07 | 13 | -22/+22 |
| | |\ \ |
|
| | | * | | Import translations. DO NOT MERGE•••Change-Id: Idfea205cf778dcf8ca4a0e7794fb4b9632441c1f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
| Bill Yi | 2017-08-06 | 13 | -22/+22 |
| | | |/ |
|
| * | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master•••am: 86b1443231 -s ours
Change-Id: Ic27567462e77c73a328a00172dc23e167dff5bd1
| Bill Yi | 2017-08-07 | 0 | -0/+0 |
| |\| | |
|
| | * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master | TreeHugger Robot | 2017-08-07 | 8 | -9/+9 |
| | |\ \ |
|
| | | * | | Import translations. DO NOT MERGE•••Change-Id: Iedf4ea3ed578b904fa9cc269909dab7ff7d26af1
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
| Bill Yi | 2017-08-06 | 8 | -9/+9 |
| | | |/ |
|
| * | | | Import translations. DO NOT MERGE•••am: 15be9b5aff -s ours
Change-Id: I9a82928f7f1364ab642341e8827fca5df3951a04
| Bill Yi | 2017-08-07 | 0 | -0/+0 |
| |\| | |
|
| | * | | Import translations. DO NOT MERGE•••Change-Id: I27db96d1703710e6a8417a3020cc4039979c6086
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
| Bill Yi | 2017-08-06 | 1 | -1/+1 |
| | |/ |
|
| * | | Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 -s...•••am: 9467382a44 -s ours
Change-Id: I79e5a199e94ac635f0b8b8b6eaea3d3b4c98457f
| Bill Yi | 2017-07-27 | 0 | -0/+0 |
| |\ \ |
|
| | * \ | Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev•••am: 01422e1ff5 -s ours
Change-Id: I7745987e0e30d8bde20015409da01213fc8903d8
| Bill Yi | 2017-07-26 | 0 | -0/+0 |
| | |\ \ |
|
| | | * \ | Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev | TreeHugger Robot | 2017-07-26 | 3 | -5/+5 |
| | | |\ \ |
|
| | | | * | | Import translations. DO NOT MERGE•••Change-Id: Ie2ee3d601e39084145911761b1204e5f4cafd219
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
| Bill Yi | 2017-07-26 | 3 | -5/+5 |
| * | | | | | Import translations. DO NOT MERGE am: 03907bdaeb -s ours•••am: e688963174 -s ours
Change-Id: Ib8cf3c801dbb33ba99cbe8dd38e1f0d0dcc56b4f
| Bill Yi | 2017-07-26 | 0 | -0/+0 |
| |\| | | | |
|
| | * | | | | Import translations. DO NOT MERGE•••am: 03907bdaeb -s ours
Change-Id: I5a88544c53e5411b1234bd5fad0c1408141a62ec
| Bill Yi | 2017-07-26 | 0 | -0/+0 |
| | |\| | | |
|
| | | * | | | Import translations. DO NOT MERGE•••Change-Id: I83d6d6794644e7bf00bcd3e9d24f801dd0f26ec7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
| Bill Yi | 2017-07-26 | 4 | -8/+8 |
| | | |/ / |
|
| * | | | | Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9•••am: 5977a3cb18
Change-Id: I5b60ba77c77a8e635cfc1f495f07b217eb486cee
|   Dan Willemsen | 2017-07-26 | 2 | -19/+0 |
| |\ \ \ \
| | |_|/
| |/| | |
|
| | * | | | Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION"•••am: 3669fbc4c9
Change-Id: Ibfbc1f11eac0870a5eec7211c868fdcb38f395e0
| Dan Willemsen | 2017-07-26 | 2 | -19/+0 |
| |/| | | |
|
| | * | | | Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" | Treehugger Robot | 2017-07-26 | 2 | -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 Willemsen | 2017-07-26 | 2 | -19/+0 |
| | |/ / / |
|
| * | | | | Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a8df•••am: c44dd5a879 -s ours
Change-Id: I08f18c4bf6f373548509882f55d1161b35fc752a
|   Paul Duffin | 2017-06-15 | 0 | -0/+0 |
| |\ \ \ \ |
|
| | * | | | | Merge "Fix dependencies of packages that target earlier releases"•••am: bde4c9a8df
Change-Id: I24ee27f2d99de7cee6aace00b3d721cd91fff3d4
| Paul Duffin | 2017-06-15 | 1 | -2/+3 |
| | |\| | | |
|
| | | * | | | Merge "Fix dependencies of packages that target earlier releases" | Paul Duffin | 2017-06-15 | 1 | -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 Duffin | 2017-06-14 | 1 | -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 Duffin | 2017-06-13 | 1 | -2/+3 |
| * | | | | | Merge "Revert "Revert "Use AAPT2""" into oc-dev•••am: e6cfc2ff63
Change-Id: I7634a7cedd45ee01facad8cc91316ce7cf1544eb
|   Adam Lesinski | 2017-05-19 | 1 | -1/+6 |
| |\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | | Merge "Revert "Revert "Use AAPT2""" into oc-dev | TreeHugger Robot | 2017-05-19 | 1 | -1/+6 |
| | |\ \ \ \ |
|
| | | * | | | | Revert "Revert "Use AAPT2""•••This reverts commit af1177453d95d727651cf48a380d7979dc94ae45.
Reason for revert: Bug in aapt2 was fixed b/38152130
Change-Id: I2701d67f581165d371a745749367c0c825168e22
| Adam Lesinski | 2017-05-17 | 1 | -1/+6 |
| * | | | | | | Merge "Revert "Use AAPT2"" into oc-dev•••am: 3ac57504cd
Change-Id: I45cb9a9ecfe5d273a2bfd56463c7a7ada868bf67
|   Alan Viverette | 2017-05-16 | 1 | -6/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "Revert "Use AAPT2"" into oc-dev | TreeHugger Robot | 2017-05-16 | 1 | -6/+1 |
| | |\| | | | |
|
| | | * | | | | Revert "Use AAPT2"•••This reverts commit 0f6f5c017629befcc4b8d9f1111e18d3505bfac1.
Change-Id: Ibba7d35846cdbf6086877fd2859c2e2c91dcf2ee
| Alan Viverette | 2017-05-15 | 1 | -6/+1 |
| * | | | | | | Merge "Prepare for removal of junit and android.test classes from Android API... | Paul Duffin | 2017-05-11 | 1 | -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 Duffin | 2017-05-10 | 1 | -1/+4 |
| * | | | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev•••am: add95c01b9 -s ours
Change-Id: If0a6f3ad7aede027d34bdce9ca6cceb7457ea210
| Bill Yi | 2017-05-11 | 0 | -0/+0 |
| |\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev | TreeHugger Robot | 2017-05-11 | 2 | -2/+2 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Import translations. DO NOT MERGE•••Change-Id: I79556fca866d6054a2327222d73809e93ba80185
Auto-generated-cl: translation import
| Bill Yi | 2017-05-10 | 2 | -2/+2 |
| * | | | | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev•••am: d20b8bd58d -s ours
Change-Id: Id10c6493693229151d15ddd872188ace68e73429
| Bill Yi | 2017-05-11 | 0 | -0/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev | TreeHugger Robot | 2017-05-11 | 3 | -4/+4 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Import translations. DO NOT MERGE•••Change-Id: Id738f4b110ee27a2c18cf8ade15afe67e5b150f8
Auto-generated-cl: translation import
| Bill Yi | 2017-05-10 | 3 | -4/+4 |
| | | |/ / / / / / |
|
| * | | / / / / / | Import translations. DO NOT MERGE•••am: 99d1abb252 -s ours
Change-Id: I9c07e145ba5f24496df9cee2849e171496ab4697
| Bill Yi | 2017-05-11 | 0 | -0/+0 |
| |\| | | | | | |
| |_|/ / / / /
|/| | | | | | |
|
| | * | | | | | | Import translations. DO NOT MERGE•••Change-Id: Icaa3e3e60a2e632a02a317b0dad32c9c6e3c1072
Auto-generated-cl: translation import
| Bill Yi | 2017-05-10 | 13 | -25/+25 |
| | |/ / / / / |
|
| * | | | | | | Merge "Prepare for removal of junit and android.test classes from Android API...•••am: 5151513a15 -s ours
Change-Id: I1551963c45f5d4b94d1fe42d3405350eda4ca389
| Paul Duffin | 2017-05-08 | 0 | -0/+0 |
| |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge "Prepare for removal of junit and android.test classes from Android API...•••am: 341a052cf9
Change-Id: I32b078a3fbb028bf9f925be3613287ba2bbd9a0d
| Paul Duffin | 2017-05-08 | 1 | -1/+4 |
| | |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
|
| | | * | | | | | Merge "Prepare for removal of junit and android.test classes from Android API...•••am: 83f0d8dc18
Change-Id: If0e4bdafb4e4451315b5a7270cfe9526d65b38f4
| Paul Duffin | 2017-05-08 | 1 | -1/+4 |
| | | |\ \ \ \ \
| | | | |_|/ /
| | | |/| | | |
|
| | | | * | | | | Merge "Prepare for removal of junit and android.test classes from Android API... | Paul Duffin | 2017-05-08 | 1 | -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: I160c136ecd1089a2b13d5cdba9eee1287aad93f9
Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2
| Paul Duffin | 2017-05-08 | 1 | -1/+4 |
| | | |/ / / / |
|
| * | | | | | | Merge "Use AAPT2" into oc-dev•••am: a9d9daebd2
Change-Id: I1c3cf78d426e298d81d1d255c315d4ed95b15afb
| Alan Viverette | 2017-05-02 | 1 | -1/+6 |
| |\ \ \ \ \ \
| | |_|/ / /
| |/| | | | |
|
| | * | | | | | Merge "Use AAPT2" into oc-dev | TreeHugger Robot | 2017-05-02 | 1 | -1/+6 |
| | |\ \ \ \ \
| | | |_|/ /
| | |/| | | |
|
