From 60c08f24a72c92446f566bb15c0ac6adc5c72d20 Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Thu, 9 Feb 2023 12:56:59 +0000 Subject: [PATCH] Revert "Don't disable dexpreopt for an unbundled build." This reverts commit d5d8904e528191cb8867d29e66e7c4cd44becadf. Reason for revert: Maybe broke the build on git_stage-aosp-master on mainline_modules_x86_64-userdebug Change-Id: Ia33a642abda127b43aa6e265deb43dca7ee04f34 --- core/config.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/config.mk b/core/config.mk index d016501edf..025a3a1de5 100644 --- a/core/config.mk +++ b/core/config.mk @@ -502,10 +502,6 @@ ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE)) DISABLE_PREOPT := true endif ifeq (true,$(TARGET_BUILD_UNBUNDLED)) - # Don't disable dexpreopt for an unbundled build. Dexpreopt generates profiles that need to be - # installed in the APEX. Soong will skip the dex2oat step after it generates the build rule for - # profiles. - DISABLE_PREOPT := ifneq (true,$(UNBUNDLED_BUILD_SDKS_FROM_SOURCE)) TARGET_BUILD_USE_PREBUILT_SDKS := true endif