Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98da13bb authored by Colin Cross's avatar Colin Cross
Browse files

resolved conflicts for 6c3bf1b8 to stage-aosp-master 

Change-Id: If93ed1d9229f7fbe750f85ea4b3c3e4fce5dbb29
parents e06e961c 6c3bf1b8

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -2042,7 +2042,7 @@ $(hide) mkdir -p $(addprefix $(dir $@)lib/,$(PRIVATE_JNI_SHARED_LIBRARIES_ABI)) 
$(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