diff options
| author |   Jean-Baptiste Queru <jbq@google.com> | 2012-01-20 10:37:20 -0800 |
|---|---|---|
| committer |   android code review <noreply-gerritcodereview@google.com> | 2012-01-20 10:37:21 -0800 |
| commit | 9a84071b36b71c9cf2b454b45308f6c1e22c0c26 (patch) | |
| tree | 69c2659811e54a2da7ab17b2148fa12546bb4cb9 | |
| parent | 23c45bac209c18dd8fd6260e338e566df946c968 (diff) | |
| parent | bd1ed5b8599412a44b7193091ee17b9435147031 (diff) | |
| download | latinime-9a84071b36b71c9cf2b454b45308f6c1e22c0c26.tar.gz latinime-9a84071b36b71c9cf2b454b45308f6c1e22c0c26.tar.xz latinime-9a84071b36b71c9cf2b454b45308f6c1e22c0c26.zip | |
Merge "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) |