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

Commit f81b80f8 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Check dir existence before finding files for OTATOOLS_DEPS." 

am: fd96f572

Change-Id: I1ec0ab995281ace1cdf222a9b70071b82b334dee
parents d2c34f3a fd96f572

core/Makefile

+14 −4
Original line number Diff line number Diff line
@@ -3169,13 +3169,23 @@ $(BUILT_OTATOOLS_PACKAGE): zip_root := $(call intermediates-dir-for,PACKAGING,ot 


OTATOOLS_DEPS := \

  system/extras/ext4_utils/mke2fs.conf \

  $(sort $(shell find external/avb/test/data -type f -name "testkey_*.pem" -o \

      -name "atx_metadata.bin")) \

  $(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 \

      -name verity_key)) \

      -name verity_key))



ifneq (,$(wildcard device))

OTATOOLS_DEPS += \

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

      -name "*.x509.pem" -o -name "oem*.prop"))

endif

ifneq (,$(wildcard external/avb))

OTATOOLS_DEPS += \

  $(sort $(shell find external/avb/test/data -type f -name "testkey_*.pem" -o \

      -name "atx_metadata.bin"))

endif

ifneq (,$(wildcard system/update_engine))

OTATOOLS_DEPS += \

  $(sort $(shell find system/update_engine/scripts -name "*.pyc" -prune -o -type f -print))

endif



OTATOOLS_RELEASETOOLS := \

  $(sort $(shell find build/make/tools/releasetools -name "*.pyc" -prune -o -type f))