diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-09 01:30:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-09 01:30:36 +0000 |
commit | 71a32643ddd711c06b7d636908c1eb09f37c82d9 (patch) | |
tree | 8fbb7047a36917f975dc631e8795ad3d891721ca | |
parent | dfadd2beae16f76e79b201162c172d21a95c9f06 (diff) | |
parent | f5034d49abf2c2f3fd099db14c2ac60c41bf332f (diff) | |
download | bsdiff-71a32643ddd711c06b7d636908c1eb09f37c82d9.tar.gz |
Merge "Update bsdiff_unittest to really work host-side" am: f5034d49ab
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1579929
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba15bd538b79044711476c0fa5bbd86e9867b68a
-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> |