From efcc94783eb3ea86ee4af78db801b646dba5525d Mon Sep 17 00:00:00 2001
From: Edward Liaw <edliaw@google.com>
Date: Wed, 6 Dec 2023 19:20:56 +0000
Subject: [PATCH] ANDROID: Disable breakpoints step_after_suspend

Android device will not suspend while usb is connected.

Bug: 67016038
Change-Id: I2a4330dac7fe2ce69c27d61b4ba67e25bd73df30
Signed-off-by: Edward Liaw <edliaw@google.com>
---
 BUILD.bazel                                       | 11 -----------
 tools/testing/selftests/android/config_arm64.xml  |  1 -
 tools/testing/selftests/android/config_x86_64.xml |  1 -
 3 files changed, 13 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index f6c225feb549..677a54d3dd09 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -982,15 +982,6 @@ cc_binary_with_abi(
     deps = [":kselftest_headers_lib"],
 )
 
-cc_binary_with_abi(
-    name = "kselftest_breakpoints_step_after_suspend_test",
-    srcs = ["tools/testing/selftests/breakpoints/step_after_suspend_test.c"],
-    path_prefix = _KSELFTEST_DIR,
-    target_compatible_with = ["@platforms//os:android"],
-    visibility = ["//visibility:private"],
-    deps = [":kselftest_headers_lib"],
-)
-
 cc_binary_with_abi(
     name = "kselftest_breakpoints_breakpoint_test",
     srcs = select({
@@ -1818,7 +1809,6 @@ android_filegroup(
     srcs = [
         ":kselftest_binderfs_binderfs_test_x86_64",
         ":kselftest_breakpoints_breakpoint_test_x86_64",
-        ":kselftest_breakpoints_step_after_suspend_test_x86_64",
         ":kselftest_futex_futex_requeue_pi_mismatched_ops_x86_64",
         ":kselftest_futex_futex_requeue_pi_signal_restart_x86_64",
         ":kselftest_futex_futex_requeue_pi_x86_64",
@@ -1879,7 +1869,6 @@ android_filegroup(
     srcs = [
         ":kselftest_binderfs_binderfs_test_arm64",
         ":kselftest_breakpoints_breakpoint_test_arm64",
-        ":kselftest_breakpoints_step_after_suspend_test_arm64",
         ":kselftest_futex_futex_requeue_arm64",
         ":kselftest_futex_futex_requeue_pi_arm64",
         ":kselftest_futex_futex_requeue_pi_mismatched_ops_arm64",
diff --git a/tools/testing/selftests/android/config_arm64.xml b/tools/testing/selftests/android/config_arm64.xml
index 41b619854286..acb7b5692d46 100644
--- a/tools/testing/selftests/android/config_arm64.xml
+++ b/tools/testing/selftests/android/config_arm64.xml
@@ -19,7 +19,6 @@ SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
         <option name="skip-binary-check" value="true" />
         <option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="/data/selftests/arm64/kselftest_binderfs_binderfs_test" />
         <option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="/data/selftests/arm64/kselftest_breakpoints_breakpoint_test" />
-        <option name="test-command-line" key="kselftest_breakpoints_step_after_suspend_test" value="/data/selftests/arm64/kselftest_breakpoints_step_after_suspend_test" />
         <option name="test-command-line" key="kselftest_futex_run" value="cd /data/selftests/arm64/;USE_COLOR=0 ./kselftest_futex_run" />
         <option name="test-command-line" key="kselftest_kcmp_kcmp_test" value="/data/selftests/arm64/kselftest_kcmp_kcmp_test" />
         <option name="test-command-line" key="kselftest_ptrace_peeksiginfo" value="/data/selftests/arm64/kselftest_ptrace_peeksiginfo" />
diff --git a/tools/testing/selftests/android/config_x86_64.xml b/tools/testing/selftests/android/config_x86_64.xml
index 610744f2405f..1c2263e8c6fb 100644
--- a/tools/testing/selftests/android/config_x86_64.xml
+++ b/tools/testing/selftests/android/config_x86_64.xml
@@ -19,7 +19,6 @@ SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
         <option name="skip-binary-check" value="true" />
         <option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="/data/selftests/x86_64/kselftest_binderfs_binderfs_test" />
         <option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="/data/selftests/x86_64/kselftest_breakpoints_breakpoint_test" />
-        <option name="test-command-line" key="kselftest_breakpoints_step_after_suspend_test" value="/data/selftests/x86_64/kselftest_breakpoints_step_after_suspend_test" />
         <option name="test-command-line" key="kselftest_futex_run" value="cd /data/selftests/x86_64/;USE_COLOR=0 ./kselftest_futex_run" />
         <option name="test-command-line" key="kselftest_kcmp_kcmp_test" value="/data/selftests/x86_64/kselftest_kcmp_kcmp_test" />
         <option name="test-command-line" key="kselftest_ptrace_peeksiginfo" value="/data/selftests/x86_64/kselftest_ptrace_peeksiginfo" />