Merge "Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set"

am: 65ba0bf59c

Change-Id: I56882452ae7e794d2cbee8f3e4c04fc1d11e1fe1
This commit is contained in:
Mathieu Chartier 2018-04-12 15:26:32 -07:00 committed by android-build-merger
commit 4157c834db
1 changed files with 2 additions and 0 deletions

View File

@ -112,8 +112,10 @@ ifeq (true,$(LOCAL_DEX_PREOPT_GENERATE_PROFILE))
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))