Merge "Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set"

This commit is contained in:
Mathieu Chartier
2018-04-12 22:10:57 +00:00
committed by Gerrit Code Review

View File

@@ -112,8 +112,10 @@ ifeq (true,$(LOCAL_DEX_PREOPT_GENERATE_PROFILE))
ifdef LOCAL_VENDOR_MODULE ifdef LOCAL_VENDOR_MODULE
$(call pretty-error, Internal error: profiles are not supported for vendor modules) $(call pretty-error, Internal error: profiles are not supported for vendor modules)
else else
ifeq (,$(LOCAL_DEX_PREOPT_APP_IMAGE))
LOCAL_DEX_PREOPT_APP_IMAGE := true LOCAL_DEX_PREOPT_APP_IMAGE := true
endif endif
endif
ifndef LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING ifndef LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING
$(call pretty-error,Must have specified class listing (LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING)) $(call pretty-error,Must have specified class listing (LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING))