From 4be14b7b159e3904d539f8038959035c58d446b4 Mon Sep 17 00:00:00 2001 From: Edward Liaw Date: Tue, 24 Sep 2024 17:01:37 +0000 Subject: [PATCH] ANDROID: Update test scripts to provide destdir instead of dist_dir Build was changed to use pkg_install instead of the deprecated copy-to-dist-dir, so the build option needs to be switched to use --destdir. Bug: 331730853 Change-Id: I5063c0676cfeafff3100396f2171ac17b338a2ff Signed-off-by: Edward Liaw --- tools/testing/android/bin/kselftest.sh | 2 +- tools/testing/android/bin/kunit.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/android/bin/kselftest.sh b/tools/testing/android/bin/kselftest.sh index a426a9e90413..4445daebe2f0 100755 --- a/tools/testing/android/bin/kselftest.sh +++ b/tools/testing/android/bin/kselftest.sh @@ -139,7 +139,7 @@ if $BUILD_KERNEL; then echo "Building kernel..." # TODO: add support to build kernel for physical device $BAZEL run $BUILD_FLAGS //common-modules/virtual-device:virtual_device_x86_64_dist -- \ - --dist_dir=$DIST_DIR + --destdir=$DIST_DIR exit_code=$? if [ $exit_code -eq 0 ]; then echo "Build kernel succeeded" diff --git a/tools/testing/android/bin/kunit.sh b/tools/testing/android/bin/kunit.sh index 6e8592cc3a73..b043da68bea2 100755 --- a/tools/testing/android/bin/kunit.sh +++ b/tools/testing/android/bin/kunit.sh @@ -141,7 +141,7 @@ if $BUILD_KERNEL; then echo "Building kernel..." # TODO: add support to build kernel for physical device $BAZEL run $BUILD_FLAGS //common-modules/virtual-device:virtual_device_x86_64_dist -- \ - --dist_dir=$DIST_DIR + --destdir=$DIST_DIR exit_code=$? if [ $exit_code -eq 0 ]; then echo "Command succeeded"