diff options
| author |   Jean-Baptiste Queru <jbq@google.com> | 2012-01-20 12:02:31 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-01-20 12:02:31 -0800 |
| commit | 2577fca158ee8cd7162c3550b465cab73b0a7dbc (patch) | |
| tree | 5ba296626804105462f165ad3453b0e47e1036ee | |
| parent | 201a8ba8531191b133ef4549b9cf0a61818a02d2 (diff) | |
| parent | 9a84071b36b71c9cf2b454b45308f6c1e22c0c26 (diff) | |
| download | latinime-2577fca158ee8cd7162c3550b465cab73b0a7dbc.tar.gz latinime-2577fca158ee8cd7162c3550b465cab73b0a7dbc.tar.xz latinime-2577fca158ee8cd7162c3550b465cab73b0a7dbc.zip | |
am 9a84071b: Merge "Make the JNI lib an optional module"
* commit '9a84071b36b71c9cf2b454b45308f6c1e22c0c26':
Make the JNI lib an optional module
| -rw-r--r-- | java/Android.mk | 1 | ||||
| -rw-r--r-- | native/Android.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/java/Android.mk b/java/Android.mk index 43168e563..e9fa52ef3 100644 --- a/java/Android.mk +++ b/java/Android.mk @@ -10,6 +10,7 @@ LOCAL_PACKAGE_NAME := LatinIME LOCAL_CERTIFICATE := shared LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime +LOCAL_REQUIRED_MODULES := libjni_latinime LOCAL_STATIC_JAVA_LIBRARIES := android-common LOCAL_STATIC_JAVA_LIBRARIES += inputmethod-common diff --git a/native/Android.mk b/native/Android.mk index f07be6abe..cf1da4a41 100644 --- a/native/Android.mk +++ b/native/Android.mk @@ -43,7 +43,7 @@ endif LOCAL_MODULE := libjni_latinime -LOCAL_MODULE_TAGS := user +LOCAL_MODULE_TAGS := optional ifeq ($(FLAG_DO_PROFILE), true) $(warning Making profiling version of native library) |