tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add lunch support for TARGET_RELEASE" am: 20f0cd3f91

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2580693

Change-Id: I10d0609f04c3a51a238643d08b386ca0dbcec17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-09 14:28:28 +00:00 committed by Automerger Merge Worker
commit 1e09574871
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/product_config.mk
View file

@ -223,7 +223,7 @@ _product_config_saved_KATI_ALLOW_RULES := $(.KATI_ALLOW_RULES)
endif
ifeq (,$(current_product_makefile))
$(error Can not locate config makefile for product "$(TARGET_PRODUCT)")
$(error Cannot locate config makefile for product "$(TARGET_PRODUCT)")
endif
ifneq (,$(filter $(TARGET_PRODUCT),$(products_using_starlark_config)))

26
envsetup.sh
View file

@ -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