commit b17f384dd74f42f68ae1f20091fdb67cce1dc0d7
author Mathieu Chartier <mathieuc@google.com> Wed May 02 23:13:42 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 02 23:13:42 2018 +0000
tree 32fdb69ee2307b2f30b7a5a7336a0018e07f41a6
parent 700077506eb00d2326acaf7d7b0d85171d3b0458
parent f16e8d0d946dc6816e656c69670d96999d69b269

Merge "Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set" into pi-dev

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 5528eda..d56c68a 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -121,8 +121,10 @@
 ifdef LOCAL_VENDOR_MODULE
 $(call pretty-error, Internal error: profiles are not supported for vendor modules)
 else
+ifeq (,$(LOCAL_DEX_PREOPT_APP_IMAGE))
 LOCAL_DEX_PREOPT_APP_IMAGE := true
 endif
+endif
 
 ifndef LOCAL_DEX_PREOPT_PROFILE
 $(call pretty-error,Must have specified class listing (LOCAL_DEX_PREOPT_PROFILE))