diff options
author | Ying Wang <wangying@google.com> | 2014-05-28 21:25:34 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-28 21:25:34 +0000 |
commit | f4999d3b8a0d09e790767176c543df1c2ad53c5a (patch) | |
tree | 47fb56f4e3a3d8bbdd8dbb0eeef3b1f84485f6f0 /core/dex_preopt_odex_install.mk | |
parent | aae7e3fa66ecf6bf796ba9a107d8f066498ab10b (diff) | |
parent | 994c226b91d0b9695cfde8dabb8f243e9f53be64 (diff) | |
download | build-f4999d3b8a0d09e790767176c543df1c2ad53c5a.zip build-f4999d3b8a0d09e790767176c543df1c2ad53c5a.tar.gz build-f4999d3b8a0d09e790767176c543df1c2ad53c5a.tar.bz2 |
Merge "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.mk | 4 |
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) |