Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9ba77f6 authored by Greg Kaiser's avatar Greg Kaiser Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Give an error when trying to build "next" targets"" into main am: d5799abc am: b79f1241 am: 4e7ba89c am: d6301e73 am: d4ececf8

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



Change-Id: I2e0fde52a009095d96895427066a83a61b5bba64
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 848e95f3 d4ececf8

core/release_config.mk

+0 −6
Original line number Diff line number Diff line
@@ -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)