summaryrefslogtreecommitdiffstats
path: root/core/dex_preopt_odex_install.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-05-28 21:28:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-28 21:28:42 +0000
commit8898f2e261d1bb2b389971803a1f4a23639ade9e (patch)
treef4cd54c14d12d94918fa11fa3fd995da7b170834 /core/dex_preopt_odex_install.mk
parent7e4c73d5885402f5c301309094ce3dbceef0ecd3 (diff)
parentf4999d3b8a0d09e790767176c543df1c2ad53c5a (diff)
downloadbuild-8898f2e261d1bb2b389971803a1f4a23639ade9e.zip
build-8898f2e261d1bb2b389971803a1f4a23639ade9e.tar.gz
build-8898f2e261d1bb2b389971803a1f4a23639ade9e.tar.bz2
am f4999d3b: Merge "Fix pattern rules for for libdvm."
* commit 'f4999d3b8a0d09e790767176c543df1c2ad53c5a': Fix pattern rules for $(installed_odex) for libdvm.
Diffstat (limited to 'core/dex_preopt_odex_install.mk')
-rw-r--r--core/dex_preopt_odex_install.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index db23140..713f595 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -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)