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

Commit a7d5df28 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Android (Google) Code Review
Browse files

Merge "Revert "For user and userdebug generate error if DEXPREOPT is not enabled"" into pi-dev

parents 4b71ac8c 0ecba4b1

core/dex_preopt.mk

+0 −10
Original line number Diff line number Diff line
@@ -46,16 +46,6 @@ ifeq ($(HOST_OS),linux) 
  ifneq (false,$(WITH_DEXPREOPT_DEBUG_INFO))

    PRODUCT_DEX_PREOPT_BOOT_FLAGS += --generate-mini-debug-info

  endif



  # Non eng linux builds must have preopt enabled so that system server doesn't run as interpreter

  # only. b/74209329

  ifeq (,$(filter eng, $(TARGET_BUILD_VARIANT)))

    ifneq (true,$(WITH_DEXPREOPT))

      ifneq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY))

        $(call pretty-error, DEXPREOPT must be enabled for user and userdebug builds)

      endif

    endif

  endif

endif



GLOBAL_DEXPREOPT_FLAGS :=

core/product.mk

+2 −1
Original line number Diff line number Diff line
@@ -317,7 +317,8 @@ _product_stash_var_list += \ 
_product_stash_var_list += \

	DEFAULT_SYSTEM_DEV_CERTIFICATE \

	WITH_DEXPREOPT \

	WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY

	WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY \

	WITH_DEXPREOPT_APP_IMAGE



#

# Mark the variables in _product_stash_var_list as readonly