tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix pattern rules for $(installed_odex) for libdvm."

Browse source
This commit is contained in:
Ying Wang 2014-05-28 21:25:34 +00:00 committed by Gerrit Code Review
commit f4999d3b8a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/dex_preopt_odex_install.mk
View file

@ -117,8 +117,8 @@ endif # boot jar
ifdef built_odex ifdef built_odex
# Use pattern rule - we may have multiple installed odex files. # Use pattern rule - we may have multiple installed odex files.
# Ugly syntax - See the definition get-odex-file-path. # Ugly syntax - See the definition get-odex-file-path.
$(installed_odex) : $(dir $(LOCAL_INSTALLED_MODULE))%/$(notdir $(word 1,$(installed_odex))) \ $(installed_odex) : $(dir $(LOCAL_INSTALLED_MODULE))%$(notdir $(word 1,$(installed_odex))) \
: $(dir $(LOCAL_BUILT_MODULE))%/$(notdir $(word 1,$(built_odex))) \ : $(dir $(LOCAL_BUILT_MODULE))%$(notdir $(word 1,$(built_odex))) \
| $(ACP) | $(ACP)
@echo "Install: $@" @echo "Install: $@"
$(copy-file-to-target) $(copy-file-to-target)

2
core/package_internal.mk
View file

@ -377,7 +377,7 @@ endif
ifdef LOCAL_DEX_PREOPT ifdef LOCAL_DEX_PREOPT
$(built_odex): PRIVATE_DEX_FILE := $(built_dex) $(built_odex): PRIVATE_DEX_FILE := $(built_dex)
$(built_odex) : $(built_dex) $(built_odex) : $(built_dex)
$(create-empty-package) $(hide) mkdir -p $(dir $@) && rm -f $@
$(add-dex-to-package) $(add-dex-to-package)
$(hide) mv $@ $@.input $(hide) mv $@ $@.input
$(call dexpreopt-one-file,$@.input,$@) $(call dexpreopt-one-file,$@.input,$@)