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

Merge "Fix warning of "overriding commands for target ...boot.oat"." into nyc-dev 

am: 234985a127

* commit '234985a1273060f00d11241e4d9e107ba900fdb3':
  Fix warning of "overriding commands for target ...boot.oat".
This commit is contained in:
Ying Wang 2016-03-15 21:13:48 +00:00 committed by android-build-merger
parent 6fb9b81946 234985a127
commit 3912b35cfc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/dex_preopt_libart.mk
View File

@ -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 # is converted into to boot.art (to match the legacy assumption that boot.art
# exists), and the rest are converted to boot-<name>.art. # exists), and the rest are converted to boot-<name>.art.
# In addition, each .art file has an associated .oat file. # 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 := $(foreach jar,$(wordlist 2,999,$(LIBART_TARGET_BOOT_JARS)),boot-$(jar).art boot-$(jar).oat)
LIBART_TARGET_BOOT_ART_EXTRA_FILES += boot.oat $(patsubst %.art,%.oat,$(LIBART_TARGET_BOOT_ART_EXTRA_FILES)) LIBART_TARGET_BOOT_ART_EXTRA_FILES += boot.oat
my_2nd_arch_prefix := my_2nd_arch_prefix :=
include $(BUILD_SYSTEM)/dex_preopt_libart_boot.mk include $(BUILD_SYSTEM)/dex_preopt_libart_boot.mk