Merge "Revert "Give an error when trying to build "next" targets"" into main am: d5799abc55 am: b79f1241b3

Original change: https://android-review.googlesource.com/c/platform/build/+/2751295

Change-Id: I112aa2321ba3ea1857068de60660f787ed9b2fd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Greg Kaiser
2023-09-19 21:21:25 +00:00
committed by Automerger Merge Worker

View File

@@ -76,12 +76,6 @@ ifneq ($(TARGET_RELEASE),)
ifeq ($(filter $(_all_release_configs), $(TARGET_RELEASE)),)
$(error No release config found for TARGET_RELEASE: $(TARGET_RELEASE). Available releases are: $(_all_release_configs))
else
# TODO(b/294161396): Remove this logic
ifeq ($(TARGET_RELEASE),next)
ifndef TESTING_TARGET_RELEASE_NEXT
$(error "next" releases are not supported yet. b/294161396)
endif
endif
# Choose flag files
# Don't sort this, use it in the order they gave us.
flag_value_files := $(_all_release_configs.$(TARGET_RELEASE).FILES)