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

Commit d6a6bca8 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Automerger Merge Worker
Browse files

Merge "Add product variable... 

Merge "Add product variable PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS." am: 4c5ed87f am: 8a54af6b am: a3028887 am: 8a0f5bc9

Original change: https://android-review.googlesource.com/c/platform/build/+/1321931

Change-Id: I6454f6e8db10e226fafec74081c2504bd41c2878
parents 5707ef76 8a0f5bc9

core/dex_preopt_config.mk

+35 −34
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) 
  $(call add_json_list, SystemServerJars,                        $(PRODUCT_SYSTEM_SERVER_JARS))

  $(call add_json_list, SystemServerApps,                        $(PRODUCT_SYSTEM_SERVER_APPS))

  $(call add_json_list, UpdatableSystemServerJars,               $(PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS))

  $(call add_json_bool, BrokenSuboptimalOrderOfSystemServerJars, $(PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS))

  $(call add_json_list, SpeedApps,                               $(PRODUCT_DEXPREOPT_SPEED_APPS))

  $(call add_json_list, PreoptFlags,                             $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS))

  $(call add_json_str,  DefaultCompilerFilter,                   $(PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER))

core/product.mk

+2 −0
Original line number Diff line number Diff line
@@ -239,6 +239,8 @@ _product_list_vars += PRODUCT_SYSTEM_SERVER_APPS 
_product_list_vars += PRODUCT_SYSTEM_SERVER_JARS

# List of system_server jars delivered via apex. Format = <apex name>:<jar name>.

_product_list_vars += PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS

# If true, then suboptimal order of system server jars does not cause an error.

_product_list_vars += PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS



# Additional system server jars to be appended at the end of the common list.

# This is necessary to avoid jars reordering due to makefile inheritance order.