Merge "Revert "Give an error when trying to build "next" targets"" into main

This commit is contained in:
Greg Kaiser 2023-09-19 19:55:07 +00:00 committed by Gerrit Code Review
commit d5799abc55

View file

@ -76,12 +76,6 @@ ifneq ($(TARGET_RELEASE),)
ifeq ($(filter $(_all_release_configs), $(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)) $(error No release config found for TARGET_RELEASE: $(TARGET_RELEASE). Available releases are: $(_all_release_configs))
else 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 # Choose flag files
# Don't sort this, use it in the order they gave us. # Don't sort this, use it in the order they gave us.
flag_value_files := $(_all_release_configs.$(TARGET_RELEASE).FILES) flag_value_files := $(_all_release_configs.$(TARGET_RELEASE).FILES)