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

Commit bc671bc6 authored by Dmitriy Ivanov's avatar Dmitriy Ivanov Committed by Android Git Automerger
Browse files

am e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" 

* commit 'e3aa1c1f':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
parents 7788547f e3aa1c1f

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ LOCAL_COMPRESS_MODULE_SYMBOLS:= 
LOCAL_STRIP_MODULE:=

LOCAL_JNI_SHARED_LIBRARIES:=

LOCAL_JNI_SHARED_LIBRARIES_ABI:=

LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS:=

LOCAL_PREBUILT_JNI_LIBS:=

LOCAL_JAR_MANIFEST:=

LOCAL_INSTRUMENTATION_FOR:=

core/definitions.mk

+3 −2
Original line number Diff line number Diff line
@@ -1903,7 +1903,8 @@ $(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 $(PRIVATE_JNI_SHARED_LIBRARIES_ZIP_OPTIONS) $(notdir $@) lib)

$(hide) (cd $(dir $@) && zip -r \

    $(if $(filter true, $(PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES)),-0,) $(notdir $@) lib)

$(hide) rm -rf $(dir $@)lib

endef
@@ -1937,7 +1938,7 @@ define align-package 
$(hide) mv $@ $@.unaligned

$(hide) $(ZIPALIGN) \

    -f \

    $(if $(findstring true, $(PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES)),-p ,) \

    $(if $(filter true, $(PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES)),-p,) \

    4 \

    $@.unaligned $@.aligned

$(hide) mv $@.aligned $@

core/package_internal.mk

+0 −1
Original line number Diff line number Diff line
@@ -369,7 +369,6 @@ $(LOCAL_BUILT_MODULE): $(AAPT) | $(ZIPALIGN) 
$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries_with_abis)

# PRIVATE_JNI_SHARED_LIBRARIES_ABI is a list of ABI names.

$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES_ABI := $(jni_shared_libraries_abis)

$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES_ZIP_OPTIONS := $(LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS)

$(LOCAL_BUILT_MODULE): PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES := $(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES)

ifneq ($(TARGET_BUILD_APPS),)

    # Include all resources for unbundled apps.