Merge "Revert "Master is now S"" into rvc-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
1db1982846
@@ -39,9 +39,9 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE
|
||||
include $(INTERNAL_BUILD_ID_MAKEFILE)
|
||||
endif
|
||||
|
||||
DEFAULT_PLATFORM_VERSION := SP1A
|
||||
MIN_PLATFORM_VERSION := SP1A
|
||||
MAX_PLATFORM_VERSION := SP1A
|
||||
DEFAULT_PLATFORM_VERSION := RP1A
|
||||
MIN_PLATFORM_VERSION := RP1A
|
||||
MAX_PLATFORM_VERSION := RP1A
|
||||
|
||||
ALLOWED_VERSIONS := $(call allowed-platform-versions,\
|
||||
$(MIN_PLATFORM_VERSION),\
|
||||
@@ -94,7 +94,6 @@ PLATFORM_VERSION_LAST_STABLE := 10
|
||||
# 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_CODENAME
|
||||
PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))
|
||||
|
Reference in New Issue
Block a user