Merge "Don't check the codename for REL configuration." into main am: 987e6ba3f2
am: 9488c6c0ea
am: ba0e5d4f76
Original change: https://android-review.googlesource.com/c/platform/build/+/2717722 Change-Id: Ib1a25de41ad908cfb3b8b7cef4b5d4b08e866d93 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -37,16 +37,18 @@ ifneq (,$(wildcard cts/))
|
||||
cts_platform_release_path := cts/tests/tests/os/assets/platform_releases.txt
|
||||
cts_platform_release_string := $(shell cat $(cts_platform_release_path))
|
||||
|
||||
ifeq (,$(findstring $(PLATFORM_VERSION),$(cts_platform_version_string)))
|
||||
define error_msg
|
||||
============================================================
|
||||
Could not find version "$(PLATFORM_VERSION)" in CTS platform version file:
|
||||
$(cts_platform_version_path)
|
||||
Most likely PLATFORM_VERSION in build/core/version_defaults.mk
|
||||
has changed and a new version must be added to this CTS file.
|
||||
============================================================
|
||||
endef
|
||||
$(error $(error_msg))
|
||||
ifeq ($(RELEASE_PLATFORM_VERSION_CODENAME_REL),)
|
||||
ifeq (,$(findstring $(PLATFORM_VERSION),$(cts_platform_version_string)))
|
||||
define error_msg
|
||||
============================================================
|
||||
Could not find version "$(PLATFORM_VERSION)" in CTS platform version file:
|
||||
$(cts_platform_version_path)
|
||||
Most likely PLATFORM_VERSION in build/core/version_defaults.mk
|
||||
has changed and a new version must be added to this CTS file.
|
||||
============================================================
|
||||
endef
|
||||
$(error $(error_msg))
|
||||
endif
|
||||
endif
|
||||
ifeq (,$(findstring $(PLATFORM_VERSION_LAST_STABLE),$(cts_platform_release_string)))
|
||||
define error_msg
|
||||
|
Reference in New Issue
Block a user