Merge "Snap for 6667347 from 45be81bbeb2b501dd925ef0515b5292e732b20f8 to oreo-cts-release" into oreo-cts-release
diff --git a/src/com/android/tradefed/result/LogFile.java b/src/com/android/tradefed/result/LogFile.java
index d40d8cd..e1e214d 100644
--- a/src/com/android/tradefed/result/LogFile.java
+++ b/src/com/android/tradefed/result/LogFile.java
@@ -15,10 +15,14 @@
*/
package com.android.tradefed.result;
-/**
- * Class to hold the metadata for a saved log file.
- */
-public class LogFile {
+import com.android.tradefed.build.BuildSerializedVersion;
+
+import java.io.Serializable;
+
+/** Class to hold the metadata for a saved log file. */
+public class LogFile implements Serializable {
+ private static final long serialVersionUID = BuildSerializedVersion.VERSION;
+
private final String mPath;
private final String mUrl;
private final boolean mIsText;
diff --git a/src/com/android/tradefed/testtype/Abi.java b/src/com/android/tradefed/testtype/Abi.java
index 1a24df5..3a39e16 100644
--- a/src/com/android/tradefed/testtype/Abi.java
+++ b/src/com/android/tradefed/testtype/Abi.java
@@ -15,10 +15,13 @@
*/
package com.android.tradefed.testtype;
+import com.android.tradefed.build.BuildSerializedVersion;
+
/**
* A class representing an ABI.
*/
public class Abi implements IAbi {
+ private static final long serialVersionUID = BuildSerializedVersion.VERSION;
private final String mName;
private final String mBitness;
diff --git a/src/com/android/tradefed/testtype/IAbi.java b/src/com/android/tradefed/testtype/IAbi.java
index 5c5aec0..2a349e1 100644
--- a/src/com/android/tradefed/testtype/IAbi.java
+++ b/src/com/android/tradefed/testtype/IAbi.java
@@ -15,10 +15,10 @@
*/
package com.android.tradefed.testtype;
-/**
- * Interface representing the ABI under test.
- */
-public interface IAbi {
+import java.io.Serializable;
+
+/** Interface representing the ABI under test. */
+public interface IAbi extends Serializable {
/**
* @return The name of the ABI.
