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

Merge "Only set TARGET_PLATFORM version in lunch when explicitly requested"

Browse Source
This commit is contained in:
Treehugger Robot
2017-05-03 04:36:55 +00:00
committed by Gerrit Code Review
parent 4b7074e249 1c1e142199
commit 4a3dc1458f
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/version_defaults.mk
View File

@@ -49,6 +49,12 @@ ALLOWED_VERSIONS := $(call allowed-platform-versions,\
ifndef TARGET_PLATFORM_VERSION
TARGET_PLATFORM_VERSION := $(DEFAULT_PLATFORM_VERSION)
else ifeq ($(TARGET_PLATFORM_VERSION),OPR1)
# HACK: lunch currently sets TARGET_PLATFORM_VERSION to
# DEFAULT_PLATFORM_VERSION, which causes unnecessary pain
# when the old DEFAULT_PLATFORM_VERSION becomes invalid.
# For now, silently upgrade OPR1 to the current default.
TARGET_PLATFORM_VERSION := $(DEFAULT_PLATFORM_VERSION)
endif
ifeq (,$(filter $(ALLOWED_VERSIONS), $(TARGET_PLATFORM_VERSION)))