p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Only set TARGET_PLATFORM version in lunch when explicitly requested" am: 4a3dc1458f am: 624932e360 

am: 6969203720

Change-Id: I84652622424ec1abe317b847d5fe00962aeb5853
This commit is contained in:
Colin Cross 2017-05-03 04:49:16 +00:00 committed by android-build-merger
parent 98d2f0e65a 6969203720
commit 49718f9b85
3 changed files with 14 additions and 3 deletions
Show Stats 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 ifndef TARGET_PLATFORM_VERSION
TARGET_PLATFORM_VERSION := $(DEFAULT_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 endif
ifeq (,$(filter $(ALLOWED_VERSIONS), $(TARGET_PLATFORM_VERSION))) ifeq (,$(filter $(ALLOWED_VERSIONS), $(TARGET_PLATFORM_VERSION)))

6
envsetup.sh
View File

@ -610,7 +610,11 @@ function lunch()
export TARGET_PRODUCT=$(get_build_var TARGET_PRODUCT) export TARGET_PRODUCT=$(get_build_var TARGET_PRODUCT)
export TARGET_BUILD_VARIANT=$(get_build_var TARGET_BUILD_VARIANT) export TARGET_BUILD_VARIANT=$(get_build_var TARGET_BUILD_VARIANT)
export TARGET_PLATFORM_VERSION=$(get_build_var TARGET_PLATFORM_VERSION) if [ -n "$version" ]; then
export TARGET_PLATFORM_VERSION=$(get_build_var TARGET_PLATFORM_VERSION)
else
unset TARGET_PLATFORM_VERSION
fi
export TARGET_BUILD_TYPE=release export TARGET_BUILD_TYPE=release
echo echo

5
tests/envsetup_tests.sh
View File

@ -19,8 +19,9 @@ default_version=$(get_build_var DEFAULT_PLATFORM_VERSION)
valid_version=PPR1 valid_version=PPR1
# lunch tests # lunch tests
check_lunch "aosp_arm64" "aosp_arm64" "eng" "$default_version" check_lunch "aosp_arm64" "aosp_arm64" "eng" ""
check_lunch "aosp_arm64-userdebug" "aosp_arm64" "userdebug" "$default_version" check_lunch "aosp_arm64-userdebug" "aosp_arm64" "userdebug" ""
check_lunch "aosp_arm64-userdebug-$default_version" "aosp_arm64" "userdebug" "$default_version"
check_lunch "aosp_arm64-userdebug-$valid_version" "aosp_arm64" "userdebug" "$valid_version" check_lunch "aosp_arm64-userdebug-$valid_version" "aosp_arm64" "userdebug" "$valid_version"
check_lunch "abc" "" "" "" check_lunch "abc" "" "" ""
check_lunch "aosp_arm64-abc" "" "" "" check_lunch "aosp_arm64-abc" "" "" ""