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

Commit 0443b460 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove extra JNI libs from prebuilt APKs"

parents 9cb5cfad 0e8a2ee1

core/definitions.mk

+7 −4
Original line number Diff line number Diff line
@@ -2416,11 +2416,14 @@ define uncompress-dexs 
  fi

endef



# Uncompress shared libraries embedded in an apk.

# Uncompress shared JNI libraries embedded in an apk.

#

define uncompress-shared-libs

  if (zipinfo $@ $(PRIVATE_EMBEDDED_JNI_LIBS) 2>/dev/null | grep -v ' stor ' >/dev/null) ; then \

    $(ZIP2ZIP) -i $@ -o $@.tmp $(addprefix -0 ,$(patsubst 'lib/*.so','lib/**/*.so',$(PRIVATE_EMBEDDED_JNI_LIBS))) && \

define uncompress-prebuilt-embedded-jni-libs

  if (zipinfo $@ 'lib/*.so' 2>/dev/null | grep -v ' stor ' >/dev/null) ; then \

    $(ZIP2ZIP) -i $@ -o $@.tmp -0 'lib/**/*.so' \

      $(if $(PRIVATE_EMBEDDED_JNI_LIBS), \

        -x 'lib/**/*.so' \

        $(addprefix -X ,$(PRIVATE_EMBEDDED_JNI_LIBS))) && \

    mv -f $@.tmp $@ ; \

  fi

endef

core/prebuilt_internal.mk

+3 −3
Original line number Diff line number Diff line
@@ -335,11 +335,11 @@ ifeq ($(LOCAL_CERTIFICATE),PRESIGNED) 
# For PRESIGNED apks we must uncompress every .so file:

# even if the .so file isn't for the current TARGET_ARCH,

# we can't strip the file.

embedded_prebuilt_jni_libs := 'lib/*.so'

embedded_prebuilt_jni_libs :=

endif

ifndef embedded_prebuilt_jni_libs

# No LOCAL_PREBUILT_JNI_LIBS, uncompress all.

embedded_prebuilt_jni_libs := 'lib/*.so'

embedded_prebuilt_jni_libs :=

endif

$(built_module): PRIVATE_EMBEDDED_JNI_LIBS := $(embedded_prebuilt_jni_libs)

$(built_module): $(ZIP2ZIP)
@@ -358,7 +358,7 @@ $(built_module) : .KATI_IMPLICIT_OUTPUTS := $(dir $(LOCAL_BUILT_MODULE))package. 
endif

$(built_module) : $(my_prebuilt_src_file) | $(ZIPALIGN) $(SIGNAPK_JAR)

	$(transform-prebuilt-to-target)

	$(uncompress-shared-libs)

	$(uncompress-prebuilt-embedded-jni-libs)

ifeq (true, $(LOCAL_UNCOMPRESS_DEX))

	$(uncompress-dexs)

endif  # LOCAL_UNCOMPRESS_DEX