StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f4999d3b: Merge "Fix pattern rules for for libdvm."

Browse Source 
* commit 'f4999d3b8a0d09e790767176c543df1c2ad53c5a':
  Fix pattern rules for $(installed_odex) for libdvm.
This commit is contained in:
Ying Wang
2014-05-28 21:28:42 +00:00
committed by Android Git Automerger
parent 7e4c73d588 f4999d3b8a
commit 8898f2e261
2 changed files with 3 additions and 3 deletions
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
# Use pattern rule - we may have multiple installed odex files.
# Ugly syntax - See the definition get-odex-file-path.
$(installed_odex) : $(dir $(LOCAL_INSTALLED_MODULE))%/$(notdir $(word 1,$(installed_odex))) \
: $(dir $(LOCAL_BUILT_MODULE))%/$(notdir $(word 1,$(built_odex))) \
$(installed_odex) : $(dir $(LOCAL_INSTALLED_MODULE))%$(notdir $(word 1,$(installed_odex))) \
: $(dir $(LOCAL_BUILT_MODULE))%$(notdir $(word 1,$(built_odex))) \
| $(ACP)
@echo "Install: $@"
$(copy-file-to-target)

2
core/package_internal.mk
View File

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