Pin TARGET_PRODUCT to aosp_arm in integration tests
aosp/3019827 does not handle the case where integration_tests might be run from an unlunched-terminal. In this scenario, the ninja file will be generated at out/soong/build.ninja. To support running integration tests with/without lunch as well for consistency of tests across different setups (users/CI etc.), pin the TARGET_PRODUCT to a default value (aosp_arm for now) Test: build/soong/tests/run_integration_tests.sh without running lunch Change-Id: I1197923867643986ed3736cfc284632aa82dca13
This commit is contained in:
parent
ab1296abc8
commit
15a1d29233
1 changed files with 1 additions and 1 deletions
|
@ -140,7 +140,7 @@ function setup {
|
||||||
|
|
||||||
# shellcheck disable=SC2120
|
# shellcheck disable=SC2120
|
||||||
function run_soong {
|
function run_soong {
|
||||||
USE_RBE=false build/soong/soong_ui.bash --make-mode --skip-ninja --skip-config --soong-only --skip-soong-tests "$@"
|
USE_RBE=false TARGET_PRODUCT=aosp_arm TARGET_RELEASE=trunk_staging TARGET_BUILD_VARIANT=userdebug build/soong/soong_ui.bash --make-mode --skip-ninja --skip-config --soong-only --skip-soong-tests "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
function create_mock_bazel {
|
function create_mock_bazel {
|
||||||
|
|
Loading…
Reference in a new issue