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

Commit 01e1fe60 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Gerrit Code Review
Browse files

Merge "Silence yet more superfluous build messages."

parents 061fcfc2 1c26bc9b

core/Makefile

+1 −9
Original line number Diff line number Diff line
@@ -1190,14 +1190,6 @@ else 
RECOVERY_RESOURCE_ZIP :=

endif



ifeq ($(TARGET_PRIVATE_RES_DIRS),)

  $(info No private recovery resources for TARGET_DEVICE $(TARGET_DEVICE))

endif



ifeq ($(recovery_fstab),)

  $(info No recovery.fstab for TARGET_DEVICE $(TARGET_DEVICE))

endif



INTERNAL_RECOVERYIMAGE_ARGS := \

	$(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \

	--kernel $(recovery_kernel) \
@@ -2193,7 +2185,7 @@ OTATOOLS_DEPS := \ 
  $(shell find system/update_engine/scripts -name \*.pyc -prune -o -type f -print | sort) \

  $(shell find build/target/product/security -type f -name \*.x509.pem -o -name \*.pk8 -o \

      -name verity_key | sort) \

  $(shell find device vendor -type f -name \*.pk8 -o -name verifiedboot\* -o \

  $(shell find device $(wildcard vendor) -type f -name \*.pk8 -o -name verifiedboot\* -o \

      -name \*.x509.pem -o -name oem\*.prop | sort)



OTATOOLS_RELEASETOOLS := \

core/definitions.mk

+6 −6
Original line number Diff line number Diff line
@@ -2569,9 +2569,9 @@ endef 
define uncompress-dexs

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

  rm -rf $(dir $@)uncompresseddexs && mkdir $(dir $@)uncompresseddexs; \

  unzip $@ '*.dex' -d $(dir $@)uncompresseddexs && \

  zip -d $@ '*.dex' && \

  ( cd $(dir $@)uncompresseddexs && find . -type f | sort | zip -D -X -0 ../$(notdir $@) -@ ) && \

  unzip -q $@ '*.dex' -d $(dir $@)uncompresseddexs && \

  zip -qd $@ '*.dex' && \

  ( cd $(dir $@)uncompresseddexs && find . -type f | sort | zip -qD -X -0 ../$(notdir $@) -@ ) && \

  rm -rf $(dir $@)uncompresseddexs; \

  fi

endef
@@ -2581,9 +2581,9 @@ endef 
define uncompress-shared-libs

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

  rm -rf $(dir $@)uncompressedlibs && mkdir $(dir $@)uncompressedlibs; \

  unzip $@ $(PRIVATE_EMBEDDED_JNI_LIBS) -d $(dir $@)uncompressedlibs && \

  zip -d $@ 'lib/*.so' && \

  ( cd $(dir $@)uncompressedlibs && find lib -type f | sort | zip -D -X -0 ../$(notdir $@) -@ ) && \

  unzip -q $@ $(PRIVATE_EMBEDDED_JNI_LIBS) -d $(dir $@)uncompressedlibs && \

  zip -qd $@ 'lib/*.so' && \

  ( cd $(dir $@)uncompressedlibs && find lib -type f | sort | zip -qD -X -0 ../$(notdir $@) -@ ) && \

  rm -rf $(dir $@)uncompressedlibs; \

  fi

endef