commit 65ba0bf59c47f75987b67301b24820ab9512eef3
author Mathieu Chartier <mathieuc@google.com> Thu Apr 12 22:10:57 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 12 22:10:57 2018 +0000
tree e2cbc03c58ac4625a28bef3209811818b3ef640e
parent f2fc1418d3338cde1dc5ccbcebd3061fca098d32
parent aaca16f0f7ef22ea39f103d5895c2d18235aa42d

Merge "Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set"

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index d462a85..c257f93 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -112,8 +112,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_CLASS_LISTING
 $(call pretty-error,Must have specified class listing (LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING))