StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't check the codename for REL configuration." into main am: 987e6ba3f2 am: 9488c6c0ea am: ba0e5d4f76

Browse Source 
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:
Treehugger Robot
2023-08-20 00:45:46 +00:00
committed by Automerger Merge Worker
parent cbc1f8abe3 ba0e5d4f76
commit f9b8392ee3
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/tasks/cts.mk
View File

@@ -37,16 +37,18 @@ 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 (,$(findstring $(PLATFORM_VERSION),$(cts_platform_version_string))) ifeq ($(RELEASE_PLATFORM_VERSION_CODENAME_REL),)
define error_msg 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) Could not find version "$(PLATFORM_VERSION)" in CTS platform version file:
Most likely PLATFORM_VERSION in build/core/version_defaults.mk $(cts_platform_version_path)
has changed and a new version must be added to this CTS file. 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)) endef
$(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