From b50bbcc72a4e2edb569fe04ca0e325d8a40ac596 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Fri, 14 Apr 2017 13:33:58 -0700
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/main.mk b/core/main.mk
index 8768b0be9..b892ce0b2 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -817,7 +817,7 @@ overridden_packages := $(call get-package-overrides,$(modules_to_install))
 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