commit cdd4343bb2e2dfc9c1886ab2749394861110848a
author Nicolas Geoffray <ngeoffray@google.com> Fri Mar 24 14:45:59 2017 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Apr 28 12:34:53 2017 +0100
tree fa41bc15326873f6fa9ddb295a81494941383af8
parent 679727afeb75b44fb59c12d735c6bb48d2ac5e65

Don't preopt system server apps in system_other.

bug:36532541
bug:33799337

Test: m -j32 && find out/target -name \*.odex

(cherry picked from commit a2c6c0b11e49d94afbde3ab34c1521ad91befb8a)

Change-Id: Ic4396bb6c543af1c05f56030495caafb245ea304

core/dex_preopt_libart.mk

diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
index ffb888c..8ee800b 100644
--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -61,7 +61,7 @@
 # $(2): the full install path (including file name) of the corresponding .apk.
 ifeq ($(BOARD_USES_SYSTEM_OTHER_ODEX),true)
 define get-odex-installed-file-path
-$(if $(filter $(foreach f,$(SYSTEM_OTHER_ODEX_FILTER),$(TARGET_OUT)/$(f)),$(2)),
+$(if $(call install-on-system-other, $(2)),
   $(call get-odex-file-path,$(1),$(patsubst $(TARGET_OUT)/%,$(TARGET_OUT_SYSTEM_OTHER)/%,$(2))),
   $(call get-odex-file-path,$(1),$(2)))
 endef