Merge "Master is now S"
This commit is contained in:
commit
19096a2479
1 changed files with 5 additions and 3 deletions
|
@ -39,9 +39,9 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE
|
|||
include $(INTERNAL_BUILD_ID_MAKEFILE)
|
||||
endif
|
||||
|
||||
DEFAULT_PLATFORM_VERSION := RP1A
|
||||
MIN_PLATFORM_VERSION := RP1A
|
||||
MAX_PLATFORM_VERSION := RP1A
|
||||
DEFAULT_PLATFORM_VERSION := SP1A
|
||||
MIN_PLATFORM_VERSION := SP1A
|
||||
MAX_PLATFORM_VERSION := SP1A
|
||||
|
||||
ALLOWED_VERSIONS := $(call allowed-platform-versions,\
|
||||
$(MIN_PLATFORM_VERSION),\
|
||||
|
@ -85,10 +85,12 @@ MAX_PLATFORM_VERSION :=
|
|||
# unreleased API level targetable by this branch, not just those that are valid
|
||||
# lunch targets for this branch.
|
||||
PLATFORM_VERSION.RP1A := R
|
||||
PLATFORM_VERSION.SP1A := S
|
||||
|
||||
# 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".
|
||||
PLATFORM_VERSION_CODENAME.RP1A := R
|
||||
PLATFORM_VERSION_CODENAME.SP1A := S
|
||||
|
||||
ifndef PLATFORM_VERSION
|
||||
PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))
|
||||
|
|
Loading…
Reference in a new issue