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

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

Merge "Add config that controls if updatable BCP is included in dexpreopt."... 

Merge "Add config that controls if updatable BCP is included in dexpreopt." am: 86755e4a am: 5ee2475e

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

Change-Id: I9d9de542732e9e57547bcb923962314148209090
parents f4f10b1a 5ee2475e

core/dex_preopt_config.mk

+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ SYSTEM_OTHER_ODEX_FILTER ?= \ 
    product/app/% \

    product/priv-app/% \



# Global switch control if updatable boot jars are included in dexpreopt.

# Currently unconditionally set to true, this may change in the future.

DEX_PREOPT_WITH_UPDATABLE_BCP := false



# Conditional to building on linux, as dex2oat currently does not work on darwin.

ifeq ($(HOST_OS),linux)

  ifeq (eng,$(TARGET_BUILD_VARIANT))
@@ -92,6 +96,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) 
  $(call add_json_bool, DisablePreoptBootImages,                 $(call invert_bool,$(ENABLE_PREOPT_BOOT_IMAGES)))

  $(call add_json_list, DisablePreoptModules,                    $(DEXPREOPT_DISABLED_MODULES))

  $(call add_json_bool, OnlyPreoptBootImageAndSystemServer,      $(filter true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY)))

  $(call add_json_bool, PreoptWithUpdatableBcp,                  $(filter true,$(DEX_PREOPT_WITH_UPDATABLE_BCP)))

  $(call add_json_bool, UseArtImage,                             $(filter true,$(DEXPREOPT_USE_ART_IMAGE)))

  $(call add_json_bool, DontUncompressPrivAppsDex,               $(filter true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS)))

  $(call add_json_list, ModulesLoadedByPrivilegedModules,        $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))