p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Silence yet more superfluous build messages."

This commit is contained in:
Tomasz Wasilczyk 2017-11-22 01:20:32 +00:00 committed by Gerrit Code Review
parent 061fcfc254 1c26bc9b27
commit 01e1fe60b8
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/Makefile
View File

@ -1190,14 +1190,6 @@ else
RECOVERY_RESOURCE_ZIP := RECOVERY_RESOURCE_ZIP :=
endif 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 := \ INTERNAL_RECOVERYIMAGE_ARGS := \
$(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \ $(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \
--kernel $(recovery_kernel) \ --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 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 \ $(shell find build/target/product/security -type f -name \*.x509.pem -o -name \*.pk8 -o \
-name verity_key | sort) \ -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) -name \*.x509.pem -o -name oem\*.prop | sort)
OTATOOLS_RELEASETOOLS := \ OTATOOLS_RELEASETOOLS := \

12
core/definitions.mk
View File

@ -2569,9 +2569,9 @@ endef
define uncompress-dexs define uncompress-dexs
$(hide) if (zipinfo $@ '*.dex' 2>/dev/null | grep -v ' stor ' >/dev/null) ; then \ $(hide) if (zipinfo $@ '*.dex' 2>/dev/null | grep -v ' stor ' >/dev/null) ; then \
rm -rf $(dir $@)uncompresseddexs && mkdir $(dir $@)uncompresseddexs; \ rm -rf $(dir $@)uncompresseddexs && mkdir $(dir $@)uncompresseddexs; \
unzip $@ '*.dex' -d $(dir $@)uncompresseddexs && \ unzip -q $@ '*.dex' -d $(dir $@)uncompresseddexs && \
zip -d $@ '*.dex' && \ zip -qd $@ '*.dex' && \
( cd $(dir $@)uncompresseddexs && find . -type f | sort | zip -D -X -0 ../$(notdir $@) -@ ) && \ ( cd $(dir $@)uncompresseddexs && find . -type f | sort | zip -qD -X -0 ../$(notdir $@) -@ ) && \
rm -rf $(dir $@)uncompresseddexs; \ rm -rf $(dir $@)uncompresseddexs; \
fi fi
endef endef
@ -2581,9 +2581,9 @@ endef
define uncompress-shared-libs define uncompress-shared-libs
$(hide) if (zipinfo $@ $(PRIVATE_EMBEDDED_JNI_LIBS) 2>/dev/null | grep -v ' stor ' >/dev/null) ; then \ $(hide) if (zipinfo $@ $(PRIVATE_EMBEDDED_JNI_LIBS) 2>/dev/null | grep -v ' stor ' >/dev/null) ; then \
rm -rf $(dir $@)uncompressedlibs && mkdir $(dir $@)uncompressedlibs; \ rm -rf $(dir $@)uncompressedlibs && mkdir $(dir $@)uncompressedlibs; \
unzip $@ $(PRIVATE_EMBEDDED_JNI_LIBS) -d $(dir $@)uncompressedlibs && \ unzip -q $@ $(PRIVATE_EMBEDDED_JNI_LIBS) -d $(dir $@)uncompressedlibs && \
zip -d $@ 'lib/*.so' && \ zip -qd $@ 'lib/*.so' && \
( cd $(dir $@)uncompressedlibs && find lib -type f | sort | zip -D -X -0 ../$(notdir $@) -@ ) && \ ( cd $(dir $@)uncompressedlibs && find lib -type f | sort | zip -qD -X -0 ../$(notdir $@) -@ ) && \
rm -rf $(dir $@)uncompressedlibs; \ rm -rf $(dir $@)uncompressedlibs; \
fi fi
endef endef