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

Commit 60c66449 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Speed up a slow find command 

  find .... -name oem\*.prop

Kati can't emulate this command -- it can't currently handle backslashes
in the middle of an argument, only at the beginning or end. So this
falls back to actually calling find, which can take a few seconds if
you've got a large vendor tree. Just switch all of these over to quoted
arguments instead of escaping the *.

Bug: 78020936
Test: Check out/soong.log for timing info
Test: out/build-taimen.ninja is identical
Change-Id: Ifde75948f677ad95107d9419a462649024f544b8
parent 36bf0df4

core/Makefile

+5 −5
Original line number Original line Diff line number Diff line
@@ -2404,14 +2404,14 @@ OTATOOLS_DEPS := \ 
  external/avb/test/data/atx_metadata.bin \

  external/avb/test/data/atx_metadata.bin \

  external/avb/test/data/testkey_atx_psk.pem \

  external/avb/test/data/testkey_atx_psk.pem \

  external/avb/test/data/testkey_rsa4096.pem \

  external/avb/test/data/testkey_rsa4096.pem \

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

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

      -name verity_key)) \

      -name verity_key)) \

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

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

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

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





OTATOOLS_RELEASETOOLS := \

OTATOOLS_RELEASETOOLS := \

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

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





ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT))

ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT))

OTATOOLS_DEPS += \

OTATOOLS_DEPS += \