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

Merge "Master is now S" am: 19096a2479

Browse Source 
Change-Id: I7b6a39f95f837e328f49a5526c440266d4be1ae3
This commit is contained in:
Dan Willemsen
2020-05-04 07:12:00 +00:00
committed by Automerger Merge Worker
parent 39c510a1da 19096a2479
commit 104cf995cc
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/version_defaults.mk
View File

@@ -39,9 +39,9 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE
include $(INTERNAL_BUILD_ID_MAKEFILE) include $(INTERNAL_BUILD_ID_MAKEFILE)
endif endif
DEFAULT_PLATFORM_VERSION := RP1A DEFAULT_PLATFORM_VERSION := SP1A
MIN_PLATFORM_VERSION := RP1A MIN_PLATFORM_VERSION := SP1A
MAX_PLATFORM_VERSION := RP1A MAX_PLATFORM_VERSION := SP1A
ALLOWED_VERSIONS := $(call allowed-platform-versions,\ ALLOWED_VERSIONS := $(call allowed-platform-versions,\
$(MIN_PLATFORM_VERSION),\ $(MIN_PLATFORM_VERSION),\
@@ -85,10 +85,12 @@ MAX_PLATFORM_VERSION :=
# unreleased API level targetable by this branch, not just those that are valid # unreleased API level targetable by this branch, not just those that are valid
# lunch targets for this branch. # lunch targets for this branch.
PLATFORM_VERSION.RP1A := R PLATFORM_VERSION.RP1A := R
PLATFORM_VERSION.SP1A := S
# These are the current development codenames, if the build is not a final # These are the current development codenames, if the build is not a final
# release build. If this is a final release build, it is simply "REL". # release build. If this is a final release build, it is simply "REL".
PLATFORM_VERSION_CODENAME.RP1A := R PLATFORM_VERSION_CODENAME.RP1A := R
PLATFORM_VERSION_CODENAME.SP1A := S
ifndef PLATFORM_VERSION ifndef PLATFORM_VERSION
PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION)) PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))