commit 387d93f0a9f3b83aba0f40f94f237cacddeb3b2c
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 25 06:21:41 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 25 06:21:43 2017 +0000
tree 271fbe61beee66be70cf24462f18322b8ce9e6c0
parent 90d202fb7f68444c7fcee1c1c99757197b2773db
parent b50bbcc72a4e2edb569fe04ca0e325d8a40ac596

Merge "Overridden packages shouldn't install vdex files either" into oc-dev

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