diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-09 02:59:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-09 02:59:13 +0000 |
commit | 63829c8b223905506b78e1ae31c8f741879262dc (patch) | |
tree | 8fbb7047a36917f975dc631e8795ad3d891721ca | |
parent | d5cac4d7f9ebfcfeb6f7f7b3dea0d8b61c7cdc99 (diff) | |
parent | d7d33cf02e5df3b74a8aad018837309d4216b576 (diff) | |
download | bsdiff-63829c8b223905506b78e1ae31c8f741879262dc.tar.gz |
Merge "Update bsdiff_unittest to really work host-side" am: f5034d49ab am: 71a32643dd am: d7d33cf02e
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1579929
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I17ad7a00d31e40f891aeee54ded1fbf96602b557
-rw-r--r-- | Android.bp | 3 | ||||
-rw-r--r-- | AndroidTest.xml | 26 |
2 files changed, 3 insertions, 26 deletions
@@ -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> |