diff options
| author | Ying Wang <wangying@google.com> | 2014-05-28 13:34:59 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-05-28 14:23:26 -0700 |
| commit | 994c226b91d0b9695cfde8dabb8f243e9f53be64 (patch) | |
| tree | 47fb56f4e3a3d8bbdd8dbb0eeef3b1f84485f6f0 | |
| parent | aae7e3fa66ecf6bf796ba9a107d8f066498ab10b (diff) | |
| download | build-994c226b91d0b9695cfde8dabb8f243e9f53be64.tar.gz | |
Fix pattern rules for $(installed_odex) for libdvm.
When the VM is libdvm, we don't put the odex files in an arch specific
subdirectory. The previous pattern rules don't work because of the extra
"/". With this change, % evaluates to empty string when it's built for
libdvm; % evaluates to "<arch_name>/" when it's built for libart.
Also removed use of $(create-empty-package), which may causes file name
(dummy) conflict with the rule of package.apk.
Bug: 15311527
Change-Id: I9f9089bc1896b78c1f47834afdb28a3a51d34480
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 4 | ||||
| -rw-r--r-- | core/package_internal.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index db2314076e..713f595eca 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) diff --git a/core/package_internal.mk b/core/package_internal.mk index cb1e4244a5..528561668e 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -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,$@) |