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

Commit e430236e authored by Mathieu Chartier's avatar Mathieu Chartier
Browse files

Revert "Revert "For user and userdebug generate error if DEXPREOPT is not enabled"" 

Fixed the failing targets.

Bug: 74209329
Test: make

This reverts commit 0ecba4b1.

(cherry picked from commit 1f1335ce)

Merged-In: I4f346b8107ffaf6afbd551d91574ed040372635e
Change-Id: I01d32749ad2cad09479e3864729ecd8ef2c63b5d
parent d4ef79d7

core/dex_preopt.mk

+10 −0
Original line number Diff line number Diff line
@@ -46,6 +46,16 @@ 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

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

	DEFAULT_SYSTEM_DEV_CERTIFICATE \

	WITH_DEXPREOPT \

	WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY \

	WITH_DEXPREOPT_APP_IMAGE

	WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY



#

# Mark the variables in _product_stash_var_list as readonly