diff options
Diffstat (limited to 'src/com/android/tradefed')
-rw-r--r-- | src/com/android/tradefed/testtype/NativeCodeCoverageListener.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/tradefed/testtype/NativeCodeCoverageListener.java b/src/com/android/tradefed/testtype/NativeCodeCoverageListener.java index b1b6c8d10..976c71e54 100644 --- a/src/com/android/tradefed/testtype/NativeCodeCoverageListener.java +++ b/src/com/android/tradefed/testtype/NativeCodeCoverageListener.java @@ -28,6 +28,8 @@ import com.android.tradefed.result.ResultForwarder; import com.android.tradefed.util.FileUtil; import com.android.tradefed.util.ZipUtil; +import com.google.common.base.Splitter; + import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -73,7 +75,7 @@ public final class NativeCodeCoverageListener extends ResultForwarder { String findResult = mDevice.executeShellCommand(COVERAGE_FILE_LIST_COMMAND); Path devicePathRoot = Paths.get(NATIVE_COVERAGE_DEVICE_PATH); - for (String deviceFile : findResult.split("\n")) { + for (String deviceFile : Splitter.on("\n").omitEmptyStrings().split(findResult)) { // Compute the relative path for the device file. Path relativePath = devicePathRoot.relativize(Paths.get(deviceFile)); Path localFullPath = localDir.toPath().resolve(relativePath); |