Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a3dc145 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 4b7074e2 1c1e1421

core/version_defaults.mk

+6 −0
Original line number Original line Diff line number Diff line
@@ -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)))

envsetup.sh

+5 −1
Original line number Original line Diff line number Diff line
@@ -608,7 +608,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)

    if [ -n "$version" ]; then

      export TARGET_PLATFORM_VERSION=$(get_build_var TARGET_PLATFORM_VERSION)

      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

tests/envsetup_tests.sh

+3 −2
Original line number Original line Diff line number Diff line
@@ -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"                            "" "" ""