Basically Android Studio does want targetSdkVersion to be specified in
build.gradle rather than AndroidManifest.xml. To make both make build
and Android Studio build happy, this CL splits <uses-sdk /> from the
main AndroidManifest.xml to a different file and let them merged in
make build.
There should be no behavior change.
Bug: 110741422
Test: Manually verified that there is no difference in
AndroidManifest.xml in the APK.
Change-Id: Ib673bca5a31b2f95329c9310a127ec0701bd8fdc
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
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
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
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
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
java.lang.IllegalAccessError: Class ref in pre-verified class resolved
to unexpected implementation because of latinime-common reference added
two times.
Change-Id: I4ce1185c10b9a217022e830b02aec4f1ea50f2eb
- Rename the jni library name
- Revert the local cert
- LatinIme2Google -> LatinIME
Please note that we'll use the new package name: com.google.android.inputmethod.latin
Change-Id: Ibbab07e8102ade5a93660c0723cd86f600c14a7d
Added tests for the dictionary lookup and correction logic on the primary dictionary.
This exercises part of the Suggest class and the native dictionary lookup code.
