commit b50bbcc72a4e2edb569fe04ca0e325d8a40ac596
author Dan Willemsen <dwillemsen@google.com> Fri Apr 14 13:33:58 2017 -0700
committer Dan Willemsen <dwillemsen@google.com> Thu Apr 20 13:34:44 2017 -0700
tree 95af0b596fe08c225c64f4f8f203ec00f3f887a4
parent dd4cdfd30a98a3d0bb73f5fe17c7be5007a1cc7c

Overridden packages shouldn't install vdex files either

Bug: 37348494
Test: internal marlin, check for WebViewGoogle.vdex
Change-Id: I16469f7d84b972cee5b13aed58f4ec3f995cb83e
Merged-In: I16469f7d84b972cee5b13aed58f4ec3f995cb83e
(cherry picked from commit e224725c956ea00d226a101c1a1d03fad6fb3da2)

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 8768b0b..b892ce0 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -817,7 +817,7 @@
 ifdef overridden_packages
 #  old_modules_to_install := $(modules_to_install)
   modules_to_install := \
-      $(filter-out $(foreach p,$(overridden_packages),$(p) %/$(p).apk %/$(p).odex), \
+      $(filter-out $(foreach p,$(overridden_packages),$(p) %/$(p).apk %/$(p).odex %/$(p).vdex), \
           $(modules_to_install))
 endif
 #$(error filtered out