commit 1401d9cf81d212b246d02a9c0850f0f5aa5607e8
author Mathieu Chartier <mathieuc@google.com> Thu Apr 12 15:33:48 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 12 15:33:48 2018 -0700
tree 357ecc8300f531b119123f89e3dd45462ec40cca
parent a8750f0dfb57b41cbf652ea22d54de2620038b3c
parent 4157c834db75297253f6795adc1d2d66a1ac88cd

Merge "Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set" am: 65ba0bf59c
am: 4157c834db

Change-Id: I19f13a153e403b96c82d9f72a82042a2c5772288

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 82f5f8d..cebbf4c 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))