diff options
| author | Jeff Hamilton <jham@google.com> | 2023-05-08 03:13:29 +0000 |
|---|---|---|
| committer | Jeff Hamilton <jham@google.com> | 2023-05-08 03:23:30 +0000 |
| commit | a02c7474491f0b082e0c72f38d492e1ae680c168 (patch) | |
| tree | ba2b7d0068742204c031dd28935332190719c445 /envsetup.sh | |
| parent | d00675c764fa61983e19e79aa9b578328a9ea5a7 (diff) | |
Add lunch support for TARGET_RELEASE
This replaces support for the unused
TARGET_PLATFORM_VERSION variable.
Now, if you pass three - separated
items the first is product, the
second is release and the third
is variant. If you only pass two
they're still product-variant
and the build system will choose
a reasonable default for release.
Test: run lunch with two and three items, confirmed values in the build banner
Change-Id: I128177d96ffe81b79b6945a24ebf37861c3b25fc
Diffstat (limited to 'envsetup.sh')
| -rw-r--r-- | envsetup.sh | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/envsetup.sh b/envsetup.sh index 17d8a5d3b9..916344cd31 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -804,13 +804,19 @@ function lunch() export TARGET_BUILD_APPS= - local product variant_and_version variant version + # Support either <product>-<variant> or <product>-<release>-<variant> + local product release_and_variant release variant 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#*-} + release_and_variant=${selection#*-} # Trim everything up to first dash + if [ "$release_and_variant" != "$selection" ]; then + local first=${release_and_variant%%-*} # Trim everything after first dash + if [ "$first" != "$release_and_variant" ]; then + # There is a 2nd dash, split into release-variant + release=$first # Everything up to the dash + variant=${release_and_variant#*-} # Trim everything up to dash + else + # There is not a 2nd dash, default to variant as the second param + variant=$first fi fi @@ -823,7 +829,7 @@ function lunch() TARGET_PRODUCT=$product \ TARGET_BUILD_VARIANT=$variant \ - TARGET_PLATFORM_VERSION=$version \ + TARGET_RELEASE=$release \ build_build_var_cache if [ $? -ne 0 ] then @@ -835,10 +841,10 @@ function lunch() fi export TARGET_PRODUCT=$(get_build_var TARGET_PRODUCT) export TARGET_BUILD_VARIANT=$(get_build_var TARGET_BUILD_VARIANT) - if [ -n "$version" ]; then - export TARGET_PLATFORM_VERSION=$(get_build_var TARGET_PLATFORM_VERSION) + if [ -n "$release" ]; then + export TARGET_RELEASE=$(get_build_var TARGET_RELEASE) else - unset TARGET_PLATFORM_VERSION + unset TARGET_RELEASE fi export TARGET_BUILD_TYPE=release |