commit 29441f934d5171daa18b170e66ea161830a49525
author David Brazdil <dbrazdil@google.com> Mon Sep 12 16:43:28 2016 +0100
committer David Brazdil <dbrazdil@google.com> Mon Sep 12 16:58:12 2016 +0100
tree aa9efcfc4deff5019df93743cef89c42c5d6f97b
parent b1d673327d7d87a34fb003372f6a9fc3af53f33e
parent 0976590e049accf10e8cc8389f2cdb25cc2b6a6f

resolve merge conflicts of 0976590 to nyc-mr1-dev-plus-aosp

Change-Id: I67a45fd1d034f143e9605cc2576c16aea4f8dbc9

core/setup_one_odex.mk

diff --git a/core/setup_one_odex.mk b/core/setup_one_odex.mk
index 36b6817..37aeb60 100644
--- a/core/setup_one_odex.mk
+++ b/core/setup_one_odex.mk
@@ -34,8 +34,17 @@
 
 my_installed_odex := $(call get-odex-installed-file-path,$($(my_2nd_arch_prefix)DEX2OAT_TARGET_ARCH),$(LOCAL_INSTALLED_MODULE))
 
+my_built_vdex := $(patsubst %.odex,%.vdex,$(my_built_odex))
+my_installed_vdex := $(patsubst %.odex,%.vdex,$(my_installed_odex))
+
 $(eval $(call copy-one-file,$(my_built_odex),$(my_installed_odex)))
+$(eval $(call copy-one-file,$(my_built_vdex),$(my_installed_vdex)))
 
 built_odex += $(my_built_odex)
+built_vdex += $(my_built_vdex)
+
 installed_odex += $(my_installed_odex)
+installed_vdex += $(my_installed_vdex)
+
 built_installed_odex += $(my_built_odex):$(my_installed_odex)
+built_installed_vdex += $(my_built_vdex):$(my_installed_vdex)