Update toolchain and make the lib build again. (#100)

The presubmit command now works and generates a report.

3 files changed, 7 insertions, 11 deletions

diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java
index f79a4b4..ea1d71f 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java
@@ -50,13 +50,11 @@ import java.util.Locale;
  *         <li>'stop' action prints 'OK (0 tests)'
  *         <li>'start' action prints nothing.
  *       </ul>
- *
  *   <li>v1.0: New instrumentation output added to track bringup process
  *       <ul>
  *         <li>"SNIPPET START, PROTOCOL &lt;major&gt; &lt;minor&gt;" upon snippet start
  *         <li>"SNIPPET SERVING, PORT &lt;port&gt;" once server is ready
  *       </ul>
- *
  * </ul>
  */
 public class SnippetRunner extends AndroidJUnitRunner {
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java
index ee1a21a..05e044c 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java
@@ -40,9 +40,8 @@ public class EventSnippet implements Snippet {
     private final EventCache mEventCache = EventCache.getInstance();
 
     @Rpc(
-        description =
-                "Blocks until an event of a specified type has been received. The returned event is removed from the cache. Default timeout is 60s."
-    )
+            description =
+                    "Blocks until an event of a specified type has been received. The returned event is removed from the cache. Default timeout is 60s.")
     public JSONObject eventWaitAndGet(
             String callbackId, String eventName, @Nullable Integer timeout)
             throws InterruptedException, JSONException, EventSnippetException {
@@ -61,11 +60,10 @@ public class EventSnippet implements Snippet {
     }
 
     @Rpc(
-        description =
-                "Gets and removes all the events of a certain name that have been received so far. "
-                        + "Non-blocking. Potentially racey since it does not guarantee no event of "
-                        + "the same name will occur after the call."
-    )
+            description =
+                    "Gets and removes all the events of a certain name that have been received so far. "
+                            + "Non-blocking. Potentially racey since it does not guarantee no event of "
+                            + "the same name will occur after the call.")
     public List<JSONObject> eventGetAll(String callbackId, String eventName)
             throws InterruptedException, JSONException {
         String qId = EventCache.getQueueId(callbackId, eventName);
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/MethodDescriptor.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/MethodDescriptor.java
index 7d3ca1f..11eb9ce 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/MethodDescriptor.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/MethodDescriptor.java
@@ -91,7 +91,7 @@ public final class MethodDescriptor {
     // TODO(damonkohler): This signature is a bit weird (auto-refactored). The obvious alternative
     // would be to work on one supplied parameter and return the converted parameter. However,
     // that's problematic because you lose the ability to call the getXXX methods on the JSON array.
-    //@VisibleForTesting
+    // @VisibleForTesting
     private static Object convertParameter(final JSONArray parameters, int index, Type type)
             throws JSONException, RpcError {
         try {