commit 98da13bbd2db4b2247b90d83deec5e8befbee536
author Colin Cross <ccross@android.com> Mon Sep 28 16:41:45 2015 -0700
committer Colin Cross <ccross@android.com> Mon Sep 28 16:41:45 2015 -0700
tree e6e616659bcfc5f6daa5400e9bd5497e3ea7b2b6
parent e06e961cc69b48e562f42464d4db0adc2b8d81d9
parent 6c3bf1b800d8b7514731cbb169b1070e172a1148

resolved conflicts for 6c3bf1b8 to stage-aosp-master

Change-Id: If93ed1d9229f7fbe750f85ea4b3c3e4fce5dbb29

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 49f474a..bdd0027 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2042,7 +2042,7 @@
 $(foreach abi,$(PRIVATE_JNI_SHARED_LIBRARIES_ABI),\
   $(call _add-jni-shared-libs-to-package-per-abi,$(abi),\
     $(patsubst $(abi):%,%,$(filter $(abi):%,$(PRIVATE_JNI_SHARED_LIBRARIES)))))
-$(hide) (cd $(dir $@) && zip -r $(JNI_COMPRESS_FLAGS) $(notdir $@) lib)
+$(hide) (cd $(dir $@) && zip -qr $(JNI_COMPRESS_FLAGS) $(notdir $@) lib)
 $(hide) rm -rf $(dir $@)lib
 endef