From 222ebac10c9c0e24c6fdac58787500c5cc30db8a Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 15 Mar 2016 12:13:56 -0700 Subject: [PATCH] Fix warning of "overriding commands for target ...boot.oat". There seems to be bug in Kati that when we write it as: LIBART_TARGET_BOOT_ART_EXTRA_FILES += boot.oat $(patsubst %.art,%.oat,$(LIBART_TARGET_BOOT_ART_EXTRA_FILES)) boot.oat ends up in the value twice. This works around the bug, filed as bug/27676615. Bug: 27546601 Change-Id: Ifc330280496083a4c817e53bc5c77c86e48a2426 --- core/dex_preopt_libart.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 05f21186e..0429b6227 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -71,8 +71,8 @@ LIBART_TARGET_BOOT_DEX_FILES := $(foreach jar,$(LIBART_TARGET_BOOT_JARS),$(call # is converted into to boot.art (to match the legacy assumption that boot.art # exists), and the rest are converted to boot-.art. # In addition, each .art file has an associated .oat file. -LIBART_TARGET_BOOT_ART_EXTRA_FILES := $(foreach jar,$(wordlist 2,999,$(LIBART_TARGET_BOOT_JARS)),boot-$(jar).art) -LIBART_TARGET_BOOT_ART_EXTRA_FILES += boot.oat $(patsubst %.art,%.oat,$(LIBART_TARGET_BOOT_ART_EXTRA_FILES)) +LIBART_TARGET_BOOT_ART_EXTRA_FILES := $(foreach jar,$(wordlist 2,999,$(LIBART_TARGET_BOOT_JARS)),boot-$(jar).art boot-$(jar).oat) +LIBART_TARGET_BOOT_ART_EXTRA_FILES += boot.oat my_2nd_arch_prefix := include $(BUILD_SYSTEM)/dex_preopt_libart_boot.mk -- 2.11.0