Merge "Don't check the codename for REL configuration." into main
This commit is contained in:
@@ -37,6 +37,7 @@ ifneq (,$(wildcard cts/))
|
|||||||
cts_platform_release_path := cts/tests/tests/os/assets/platform_releases.txt
|
cts_platform_release_path := cts/tests/tests/os/assets/platform_releases.txt
|
||||||
cts_platform_release_string := $(shell cat $(cts_platform_release_path))
|
cts_platform_release_string := $(shell cat $(cts_platform_release_path))
|
||||||
|
|
||||||
|
ifeq ($(RELEASE_PLATFORM_VERSION_CODENAME_REL),)
|
||||||
ifeq (,$(findstring $(PLATFORM_VERSION),$(cts_platform_version_string)))
|
ifeq (,$(findstring $(PLATFORM_VERSION),$(cts_platform_version_string)))
|
||||||
define error_msg
|
define error_msg
|
||||||
============================================================
|
============================================================
|
||||||
@@ -48,6 +49,7 @@ ifneq (,$(wildcard cts/))
|
|||||||
endef
|
endef
|
||||||
$(error $(error_msg))
|
$(error $(error_msg))
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
ifeq (,$(findstring $(PLATFORM_VERSION_LAST_STABLE),$(cts_platform_release_string)))
|
ifeq (,$(findstring $(PLATFORM_VERSION_LAST_STABLE),$(cts_platform_release_string)))
|
||||||
define error_msg
|
define error_msg
|
||||||
============================================================
|
============================================================
|
||||||
|
Reference in New Issue
Block a user