summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-04-17 18:41:43 -0700
committerYing Wang <wangying@google.com>2014-04-17 18:41:43 -0700
commit1a161f759167dc8824ea40d3f661a69799b59e3b (patch)
tree77146e855548c0bc719f89373fa183beab19ed26
parent96403af9b78d4852f1ac86857a319e078e8fc93f (diff)
downloadandroid_packages_apps_Terminal-1a161f759167dc8824ea40d3f661a69799b59e3b.tar.gz
android_packages_apps_Terminal-1a161f759167dc8824ea40d3f661a69799b59e3b.tar.bz2
android_packages_apps_Terminal-1a161f759167dc8824ea40d3f661a69799b59e3b.zip
Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.
Change-Id: I70f31f5cf4fa86f94fa1cdcd212f6e0ade3c549e
-rw-r--r--Android.mk9
1 files changed, 1 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk
index 6144db7..b0ba92c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,14 +7,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
-# 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
+LOCAL_JNI_SHARED_LIBRARIES := libjni_terminal
# TODO: enable proguard once development has settled down
#LOCAL_PROGUARD_FLAG_FILES := proguard.flags