From c5a1b2af59cd66c5377b7e8e9cdf8bef00e93b99 Mon Sep 17 00:00:00 2001
From: Treehugger Robot <treehugger-gerrit@google.com>
Date: Mon, 24 Aug 2020 22:12:33 +0000
Subject: Merge "Fix flaky tests by require root for minadbd_tests" am:
 f820e62701 am: d66516ea7c

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1409248

Bug: 183523550

Change-Id: I8ba2762b11802ba60bc79fe4ae5fe6eea3437cd6
(cherry picked from commit bc606682d28b3b84ed1d1184b022ee5d1e7ff643)
---
 minadbd/Android.bp      | 1 +
 minadbd/AndroidTest.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index 4cdcac6d9..b6ca59efa 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -135,4 +135,5 @@ cc_test {
     test_suites: [
         "device-tests",
     ],
+    require_root: true,
 }
diff --git a/minadbd/AndroidTest.xml b/minadbd/AndroidTest.xml
index 7ea235b7c..dbcbac250 100644
--- a/minadbd/AndroidTest.xml
+++ b/minadbd/AndroidTest.xml
@@ -18,9 +18,10 @@
         <option name="cleanup" value="true" />
         <option name="push" value="minadbd_test->/data/local/tmp/minadbd_test" />
     </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
     <option name="test-suite-tag" value="apct" />
     <test class="com.android.tradefed.testtype.GTest" >
         <option name="native-test-device-path" value="/data/local/tmp" />
         <option name="module-name" value="minadbd_test" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
-- 
cgit v1.2.3