Merge "Update bsdiff_unittest to really work host-side" am: f5034d49ab am: 71a32643dd am: d7d33cf02e am: 63829c8b22

Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1579929

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb3662e6d99512f51bc9058535848da936ab7aec

2 files changed, 3 insertions, 26 deletions

diff --git a/Android.bp b/Android.bp
index 0330a32..ee6dc4f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -163,4 +163,7 @@ cc_test {
             cflags: ["-DBSDIFF_TARGET_UNITTEST"],
         },
     },
+    test_options: {
+        unit_test: true,
+    },
 }
diff --git a/AndroidTest.xml b/AndroidTest.xml
deleted file mode 100644
index 6394c0e..0000000
--- a/AndroidTest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Config for bsdiff_unittest">
-    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
-        <option name="cleanup" value="true" />
-        <option name="push" value="bsdiff_unittest->/data/local/tmp/bsdiff_unittest" />
-    </target_preparer>
-    <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="bsdiff_unittest" />
-    </test>
-</configuration>