Merge "Make the default preopt 'interpret-only'."

am: 078aafc590

Change-Id: Ie0451fabf2220390e0c85e8720399a6ebed06e4f
This commit is contained in:
Nicolas Geoffray 2017-04-28 12:10:01 +00:00 committed by android-build-merger
commit 21715c25af

View file

@ -152,10 +152,15 @@ LOCAL_DEX_PREOPT_FLAGS := $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS)
endif
endif
ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(PRODUCT_SYSTEM_SERVER_APPS),$(LOCAL_MODULE)))
# Jars of system server, and apps loaded into system server should be
# compiled with the 'speed' compiler filter.
ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(PRODUCT_SYSTEM_SERVER_APPS),$(LOCAL_MODULE)))
LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=speed
else
# If no compiler filter is specified, default to 'interpret-only' to save on storage.
ifeq (,$(filter --compiler-filter=%, $(LOCAL_DEX_PREOPT_FLAGS)))
LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=interpret-only
endif
endif
$(built_odex): PRIVATE_DEX_PREOPT_FLAGS := $(LOCAL_DEX_PREOPT_FLAGS)