commit 01f4e201726e8029fbfb0e3a730890d9f1366844
author Dan Willemsen <dwillemsen@google.com> Fri Apr 14 23:53:21 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 14 23:53:23 2017 +0000
tree c95550d4c7b4eaf73248c0706dfc1046b3f7ed66
parent dd63df89d5c60ed5726a7c5e109508e2ef60c039
parent e224725c956ea00d226a101c1a1d03fad6fb3da2

Merge "Overridden packages shouldn't install vdex files either"

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 63f1bf5..a36251d 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -811,7 +811,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