Revert "For user and userdebug generate error if DEXPREOPT is not enabled"
This reverts commit f26b8e4249b87df3af4f9ef7e96d453781cc4d2d.
Reason for revert: Too many broken targets
Bug: 74209329
Change-Id: I8f1390eacf685e1b7144b712fe5afb8da384ceb0
(cherry picked from commit 0ecba4b139fc69d94549b612c8471c5f37fb536a)
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index 270e5f4..83c4a95 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -46,16 +46,6 @@
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 :=
diff --git a/core/product.mk b/core/product.mk
index 19ede82..6cccebf 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -317,7 +317,8 @@
_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
