Merge "Make the JNI lib an optional module"

main
Jean-Baptiste Queru 2012-01-20 10:37:20 -08:00 committed by android code review
commit 9a84071b36
2 changed files with 2 additions and 1 deletions

View File

@ -10,6 +10,7 @@ LOCAL_PACKAGE_NAME := LatinIME
LOCAL_CERTIFICATE := shared LOCAL_CERTIFICATE := shared
LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
LOCAL_REQUIRED_MODULES := libjni_latinime
LOCAL_STATIC_JAVA_LIBRARIES := android-common LOCAL_STATIC_JAVA_LIBRARIES := android-common
LOCAL_STATIC_JAVA_LIBRARIES += inputmethod-common LOCAL_STATIC_JAVA_LIBRARIES += inputmethod-common

View File

@ -43,7 +43,7 @@ endif
LOCAL_MODULE := libjni_latinime LOCAL_MODULE := libjni_latinime
LOCAL_MODULE_TAGS := user LOCAL_MODULE_TAGS := optional
ifeq ($(FLAG_DO_PROFILE), true) ifeq ($(FLAG_DO_PROFILE), true)
$(warning Making profiling version of native library) $(warning Making profiling version of native library)