aboutsummaryrefslogtreecommitdiffstats
path: root/envsetup.sh
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-03-24 00:27:16 (GMT)
committerandroid-build-merger <android-build-merger@google.com>2017-03-24 00:27:16 (GMT)
commit1b81278572f132fc5449b52bc828089ab7434544 (patch)
treebfaf14e5d6d0fa9066d0365ca6693ebc8c204ce6 /envsetup.sh
parent13af7e6e8d9d041f677d472f15365517fb919843 (diff)
parent086d109f350c245645693153357cdef2ca5fe06d (diff)
downloadandroid_build-1b81278572f132fc5449b52bc828089ab7434544.zip
android_build-1b81278572f132fc5449b52bc828089ab7434544.tar.gz
android_build-1b81278572f132fc5449b52bc828089ab7434544.tar.bz2
Merge "Add TARGET_PLATFORM_VERSION to lunch" am: a007142381 am: 7b5dc8ad3e
am: 086d109f35 Change-Id: If005f3917b1f1664b111ce7d070590a47a259ce5
Diffstat (limited to 'envsetup.sh')
-rw-r--r--envsetup.sh48
1 files changed, 20 insertions, 28 deletions
diff --git a/envsetup.sh b/envsetup.sh
index b58640d..e6c5021 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -296,7 +296,7 @@ function set_stuff_for_environment()
function set_sequence_number()
{
- export BUILD_ENV_SEQUENCE_NUMBER=12
+ export BUILD_ENV_SEQUENCE_NUMBER=13
}
function settitle()
@@ -571,50 +571,42 @@ function lunch()
then
selection=${LUNCH_MENU_CHOICES[$(($answer-1))]}
fi
- elif (echo -n $answer | grep -q -e "^[^\-][^\-]*-[^\-][^\-]*$")
- then
+ else
selection=$answer
fi
- if [ -z "$selection" ]
- then
- echo
- echo "Invalid lunch combo: $answer"
- return 1
- fi
-
export TARGET_BUILD_APPS=
- local variant=$(echo -n $selection | sed -e "s/^[^\-]*-//")
- check_variant $variant
- if [ $? -ne 0 ]
+ local product variant_and_version variant version
+
+ product=${selection%%-*} # Trim everything after first dash
+ variant_and_version=${selection#*-} # Trim everything up to first dash
+ if [ "$variant_and_version" != "$selection" ]; then
+ variant=${variant_and_version%%-*}
+ if [ "$variant" != "$variant_and_version" ]; then
+ version=${variant_and_version#*-}
+ fi
+ fi
+
+ if [ -z "$product" ]
then
echo
- echo "** Invalid variant: '$variant'"
- echo "** Must be one of ${VARIANT_CHOICES[@]}"
- variant=
+ echo "Invalid lunch combo: $selection"
+ return 1
fi
- local product=$(echo -n $selection | sed -e "s/-.*$//")
TARGET_PRODUCT=$product \
TARGET_BUILD_VARIANT=$variant \
+ TARGET_PLATFORM_VERSION=$version \
build_build_var_cache
if [ $? -ne 0 ]
then
- echo
- echo "** Don't have a product spec for: '$product'"
- echo "** Do you have the right repo manifest?"
- product=
- fi
-
- if [ -z "$product" -o -z "$variant" ]
- then
- echo
return 1
fi
- export TARGET_PRODUCT=$product
- export TARGET_BUILD_VARIANT=$variant
+ export TARGET_PRODUCT=$(get_build_var TARGET_PRODUCT)
+ export TARGET_BUILD_VARIANT=$(get_build_var TARGET_BUILD_VARIANT)
+ export TARGET_PLATFORM_VERSION=$(get_build_var TARGET_PLATFORM_VERSION)
export TARGET_BUILD_TYPE=release
echo