From 011b969d813d451f91b10c1f1d6a243f96efa247 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Fri, 5 Nov 2021 17:52:06 -0700 Subject: [PATCH] Replace foreach loops with the calls to copy-files Bug: 190051051 Test: treehugger Merged-In: I7e48ce741f6c9d0997f024e567daeec926fecb11 Change-Id: I7e48ce741f6c9d0997f024e567daeec926fecb11 --- audio/oriole/audio-tables.mk | 6 +----- audio/raven/audio-tables.mk | 6 +----- audio/slider/audio-tables.mk | 6 +----- audio/whitefin/audio-tables.mk | 6 +----- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/audio/oriole/audio-tables.mk b/audio/oriole/audio-tables.mk index 6c3fc3a..7b41458 100644 --- a/audio/oriole/audio-tables.mk +++ b/audio/oriole/audio-tables.mk @@ -37,11 +37,7 @@ PRODUCT_COPY_FILES += \ SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw SPK_FIRMWARE_FULL_PATH := device/google/raviole/audio/$(SPK_FIRMWARE_PATH) -SPK_FIRMWAR_FILES := $(wildcard $(SPK_FIRMWARE_FULL_PATH)/*) - -PRODUCT_COPY_FILES += $(foreach spk_firmware, \ - $(SPK_FIRMWAR_FILES), \ - $(spk_firmware):$(TARGET_COPY_OUT_VENDOR)/firmware/$(notdir $(spk_firmware))) +PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*),$(TARGET_COPY_OUT_VENDOR)/firmware) # Audio tuning PRODUCT_COPY_FILES += \ diff --git a/audio/raven/audio-tables.mk b/audio/raven/audio-tables.mk index cc64f06..81c7f04 100644 --- a/audio/raven/audio-tables.mk +++ b/audio/raven/audio-tables.mk @@ -37,11 +37,7 @@ PRODUCT_COPY_FILES += \ SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw SPK_FIRMWARE_FULL_PATH := device/google/raviole/audio/$(SPK_FIRMWARE_PATH) -SPK_FIRMWAR_FILES := $(wildcard $(SPK_FIRMWARE_FULL_PATH)/*) - -PRODUCT_COPY_FILES += $(foreach spk_firmware, \ - $(SPK_FIRMWAR_FILES), \ - $(spk_firmware):$(TARGET_COPY_OUT_VENDOR)/firmware/$(notdir $(spk_firmware))) +PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*),$(TARGET_COPY_OUT_VENDOR)/firmware) # Audio tuning PRODUCT_COPY_FILES += \ diff --git a/audio/slider/audio-tables.mk b/audio/slider/audio-tables.mk index 5bab01f..691d5c9 100644 --- a/audio/slider/audio-tables.mk +++ b/audio/slider/audio-tables.mk @@ -36,11 +36,7 @@ PRODUCT_COPY_FILES += \ SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw SPK_FIRMWARE_FULL_PATH := device/google/raviole/audio/$(SPK_FIRMWARE_PATH) -SPK_FIRMWAR_FILES := $(wildcard $(SPK_FIRMWARE_FULL_PATH)/*) - -PRODUCT_COPY_FILES += $(foreach spk_firmware, \ - $(SPK_FIRMWAR_FILES), \ - $(spk_firmware):$(TARGET_COPY_OUT_VENDOR)/firmware/$(notdir $(spk_firmware))) +PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*),$(TARGET_COPY_OUT_VENDOR)/firmware) # Audio tuning PRODUCT_COPY_FILES += \ diff --git a/audio/whitefin/audio-tables.mk b/audio/whitefin/audio-tables.mk index 4b13502..b48b44e 100644 --- a/audio/whitefin/audio-tables.mk +++ b/audio/whitefin/audio-tables.mk @@ -36,11 +36,7 @@ PRODUCT_COPY_FILES += \ SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw SPK_FIRMWARE_FULL_PATH := device/google/raviole/audio/$(SPK_FIRMWARE_PATH) -SPK_FIRMWAR_FILES := $(wildcard $(SPK_FIRMWARE_FULL_PATH)/*) - -PRODUCT_COPY_FILES += $(foreach spk_firmware, \ - $(SPK_FIRMWAR_FILES), \ - $(spk_firmware):$(TARGET_COPY_OUT_VENDOR)/firmware/$(notdir $(spk_firmware))) +PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*),$(TARGET_COPY_OUT_VENDOR)/firmware) # Audio tuning PRODUCT_COPY_FILES += \