diff options
author | Ying Wang <wangying@google.com> | 2014-04-17 18:41:43 -0700 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2014-04-17 18:41:43 -0700 |
commit | 1a161f759167dc8824ea40d3f661a69799b59e3b (patch) | |
tree | 77146e855548c0bc719f89373fa183beab19ed26 | |
parent | 96403af9b78d4852f1ac86857a319e078e8fc93f (diff) | |
download | Terminal-1a161f759167dc8824ea40d3f661a69799b59e3b.tar.gz |
Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-release
Change-Id: I70f31f5cf4fa86f94fa1cdcd212f6e0ade3c549e
-rw-r--r-- | Android.mk | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -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 |