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

am: 1401d9cf81

Change-Id: I50c0e10745c89ab8bb59e945cf614c4dee8e9ce6
This commit is contained in:
Mathieu Chartier 2018-04-12 16:57:04 -07:00 committed by android-build-merger
commit 09136fd119
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))