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

resolve merge conflicts of da00e137ec to stage-aosp-master

Browse Source 
Change-Id: Ie81c0f4f5f14ae3e51ee717a50d0c29b26161b90
This commit is contained in:
Colin Cross
2017-03-15 10:20:24 -07:00
parent 8843039368 da00e137ec
commit 2afade582d
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/version_defaults.mk
View File

@@ -76,7 +76,8 @@ ENABLED_VERSIONS := $(call find_and_earlier,$(ALL_VERSIONS),$(TARGET_PLATFORM_VE
$(foreach v,$(ENABLED_VERSIONS), \ $(foreach v,$(ENABLED_VERSIONS), \
$(eval IS_AT_LEAST_$(v) := true)) $(eval IS_AT_LEAST_$(v) := true))
ifndef PLATFORM_VERSION # Default versions for each TARGET_PLATFORM_VERSION
# This is the canonical definition of the platform version, # This is the canonical definition of the platform version,
# which is the version that we reveal to the end user. # which is the version that we reveal to the end user.
# Update this value when the platform version changes (rather # Update this value when the platform version changes (rather
@@ -90,7 +91,18 @@ ifndef PLATFORM_VERSION
# When you change PLATFORM_VERSION for a given PLATFORM_SDK_VERSION # When you change PLATFORM_VERSION for a given PLATFORM_SDK_VERSION
# please add that PLATFORM_VERSION to the following text file: # please add that PLATFORM_VERSION to the following text file:
# cts/tests/tests/os/assets/platform_versions.txt # cts/tests/tests/os/assets/platform_versions.txt
PLATFORM_VERSION := 7.1.2 PLATFORM_VERSION.O := O
# This is the current development code-name, if the build is not a final
# release build. If this is a final release build, it is simply "REL".
PLATFORM_VERSION_CODENAME.O := O
ifndef PLATFORM_VERSION
PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))
ifndef PLATFORM_VERSION
# PLATFORM_VERSION falls back to TARGET_PLATFORM_VERSION
PLATFORM_VERSION := $(TARGET_PLATFORM_VERSION)
endif
endif endif
ifndef PLATFORM_SDK_VERSION ifndef PLATFORM_SDK_VERSION
@@ -123,9 +135,11 @@ ifndef PLATFORM_JACK_MIN_SDK_VERSION
endif endif
ifndef PLATFORM_VERSION_CODENAME ifndef PLATFORM_VERSION_CODENAME
# This is the current development code-name, if the build is not a final PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))
# release build. If this is a final release build, it is simply "REL". ifndef PLATFORM_VERSION_CODENAME
PLATFORM_VERSION_CODENAME := REL # PLATFORM_VERSION_CODENAME falls back to TARGET_PLATFORM_VERSION
PLATFORM_VERSION_CODENAME := $(TARGET_PLATFORM_VERSION)
endif
# This is all of the development codenames that are active. Should be either # This is all of the development codenames that are active. Should be either
# the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional # the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional