diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-04-05 17:13:05 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2013-04-05 17:27:35 -0700 |
commit | 1ab44ccbc1ff77b48d6913793e71c7f92a1b584c (patch) | |
tree | 48c91a6aae393a7b099a4a211f4c34a7b009a64c | |
parent | 2c9fd65deb2845e14bd5a1fdb4569514fbdeef0b (diff) | |
download | Terminal-1ab44ccbc1ff77b48d6913793e71c7f92a1b584c.tar.gz |
Include JNI in both system and unbundled apps.
Change-Id: Ib7767c9c0be07476960f6cf3fa8f15d0ded00ff8
-rw-r--r-- | Android.mk | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -7,7 +7,14 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 -LOCAL_JNI_SHARED_LIBRARIES := libjni_terminal +# If this is an unbundled build (to install seprately) then include +# the libraries in the APK, otherwise just put them in /system/lib and +# leave them out of the APK +ifneq (,$(TARGET_BUILD_APPS)) + LOCAL_JNI_SHARED_LIBRARIES := libjni_terminal +else + LOCAL_REQUIRED_MODULES := libjni_terminal +endif # TODO: enable proguard once development has settled down #LOCAL_PROGUARD_FLAG_FILES := proguard.flags |