From aa45068cc74374be28eda197dfed65f2b8b4d72e Mon Sep 17 00:00:00 2001
From: Dario Freni <dariofreni@google.com>
Date: Wed, 4 Jul 2018 16:28:18 +0100
Subject: [PATCH] Install /system/product apps odex in system-other.

This will cause odex/vdex files for apps installed under
/system/product/{priv-,}app to be installed in system-other image, under
/system/product/{priv-,}app as well.

Test: m on marlin-userdebug target, analyzed
installed-files{,-system-other}.txt
Bug: 110072687

Change-Id: I63406f91acc3de4b4f142767e28d45308706c7da
---
 core/dex_preopt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index 270e5f4fed..de830d45ce 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -21,7 +21,7 @@ DEX_PREOPT_DEFAULT ?= true
 
 # The default filter for which files go into the system_other image (if it is
 # being used). To bundle everything one should set this to '%'
-SYSTEM_OTHER_ODEX_FILTER ?= app/% priv-app/%
+SYSTEM_OTHER_ODEX_FILTER ?= app/% priv-app/% product/app/% product/priv-app/%
 
 # Method returning whether the install path $(1) should be for system_other.
 # Under SANITIZE_LITE, we do not want system_other. Just put things under /data/asan.