Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60431c09 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Gerrit Code Review
Browse files

Merge "Add a product property for changing the default compiler filter"

parents f5a87046 e8fb7cf8

core/dex_preopt_odex_install.mk

+7 −2
Original line number Diff line number Diff line
@@ -224,6 +224,12 @@ ifeq (,$(my_system_server_compiler_filter)) 
my_system_server_compiler_filter := speed

endif



my_default_compiler_filter := $(PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER)

ifeq (,$(my_default_compiler_filter))

# If no default compiler filter is specified, default to 'quicken' to save on storage.

my_default_compiler_filter := quicken

endif



ifeq (,$(filter --compiler-filter=%, $(LOCAL_DEX_PREOPT_FLAGS)))

  ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS),$(LOCAL_MODULE)))

    # Jars of system server, use the product option if it is set, speed otherwise.
@@ -238,8 +244,7 @@ ifeq (,$(filter --compiler-filter=%, $(LOCAL_DEX_PREOPT_FLAGS))) 
        # For non system server jars, use speed-profile when we have a profile.

        LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=speed-profile

      else

        # If no compiler filter is specified, default to 'quicken' to save on storage.

        LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=quicken

         LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=$(my_default_compiler_filter)

      endif

    endif

  endif

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ _product_var_list := \ 
    PRODUCT_PRODUCT_VERITY_PARTITION \

    PRODUCT_SYSTEM_SERVER_DEBUG_INFO \

    PRODUCT_DEX_PREOPT_MODULE_CONFIGS \

    PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER \

    PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \

    PRODUCT_DEX_PREOPT_BOOT_FLAGS \

    PRODUCT_DEX_PREOPT_PROFILE_DIR \

core/product_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -392,6 +392,8 @@ PRODUCT_OTA_PUBLIC_KEYS := $(sort \ 
PRODUCT_EXTRA_RECOVERY_KEYS := $(sort \

    $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_EXTRA_RECOVERY_KEYS))



PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER))

PRODUCT_DEX_PREOPT_DEFAULT_FLAGS := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_DEFAULT_FLAGS))

PRODUCT_DEX_PREOPT_BOOT_FLAGS := \