commit 3e55bc8795e40e3545af39796c7c9a7b10bce6d2
author Nicolas Geoffray <ngeoffray@google.com> Fri Apr 28 12:12:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 28 12:12:30 2017 +0000
tree bdc5791536fd6cf6b35ee1c27adce0fa6e1bbad6
parent cf6d9f23bf52a5fff6107294870240e4511e15ef
parent 21715c25afd4e140425d7d256e30309b966d6ac4

Merge "Make the default preopt 'interpret-only'." am: 078aafc590
am: 21715c25af

Change-Id: I811fbf23e5101e5197e9711bd8648c52e8dda9e1

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 4d8e2d2..69b0230 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -152,10 +152,15 @@
 endif
 endif
 
-# 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)))
+  # Jars of system server, and apps loaded into system server should be
+  # compiled with the 'speed' compiler filter.
   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)