summaryrefslogtreecommitdiffstats
path: root/core/tests
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2015-04-17 19:47:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-17 19:47:51 +0000
commit5e4b823aa04aaaf78349d4e6f0f45077e83702ab (patch)
tree60dc4b320af9cf6a12db79b98410b894354c6b10 /core/tests
parente0a31c8bab34ccf330590cc6768d7e371b767844 (diff)
parent34f0fd239c456e4e064e4c14b768962292023800 (diff)
downloadframeworks_base-5e4b823aa04aaaf78349d4e6f0f45077e83702ab.zip
frameworks_base-5e4b823aa04aaaf78349d4e6f0f45077e83702ab.tar.gz
frameworks_base-5e4b823aa04aaaf78349d4e6f0f45077e83702ab.tar.bz2
am 34f0fd23: am a04b4302: am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit '34f0fd239c456e4e064e4c14b768962292023800': Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Diffstat (limited to 'core/tests')
-rw-r--r--core/tests/coretests/apks/install_jni_lib_open_from_apk/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/tests/coretests/apks/install_jni_lib_open_from_apk/Android.mk b/core/tests/coretests/apks/install_jni_lib_open_from_apk/Android.mk
index 5fa2405..6ee6ffa 100644
--- a/core/tests/coretests/apks/install_jni_lib_open_from_apk/Android.mk
+++ b/core/tests/coretests/apks/install_jni_lib_open_from_apk/Android.mk
@@ -5,7 +5,6 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := install_jni_lib_open_from_apk
-LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS := -0
LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES := true
include $(FrameworkCoreTests_BUILD_PACKAGE)