Merge "Revert "Don't disable dexpreopt for an unbundled build."" am: 9964bf51e5
Original change: https://android-review.googlesource.com/c/platform/build/+/2428694 Change-Id: If189521931a7dd959f260ef1408799550bb54c51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -502,10 +502,6 @@ ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE))
|
|||||||
DISABLE_PREOPT := true
|
DISABLE_PREOPT := true
|
||||||
endif
|
endif
|
||||||
ifeq (true,$(TARGET_BUILD_UNBUNDLED))
|
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))
|
ifneq (true,$(UNBUNDLED_BUILD_SDKS_FROM_SOURCE))
|
||||||
TARGET_BUILD_USE_PREBUILT_SDKS := true
|
TARGET_BUILD_USE_PREBUILT_SDKS := true
|
||||||
endif
|
endif
|
||||||
|
Reference in New Issue
Block a user