Merge "Update Guava 15.0 -> 17.0" into studio-1.0-dev

5 files changed, 30 insertions, 13 deletions

diff --git a/eclipse/build.gradle b/eclipse/build.gradle
index 8671690..b1a210e 100644
--- a/eclipse/build.gradle
+++ b/eclipse/build.gradle
@@ -70,7 +70,7 @@ def artifacts = [
         'commons-logging-1.1.1'            : 'commons-logging:commons-logging:1.1.1',
         'easymock'                         : 'org.easymock:easymock:2.4',
         'freemarker-2.3.20'                : 'org.freemarker:freemarker:2.3.20',
-        'guava-15.0'                       : 'com.google.guava:guava:15.0',
+        'guava-17.0'                       : 'com.google.guava:guava:17.0',
         'host-libprotobuf-java-2.3.0-lite' : 'com.android.tools.external:libprotobuf-java-lite:2.3.0',
         'httpclient-4.1.1'                 : 'org.apache.httpcomponents:httpclient:4.1.1',
         'httpcore-4.1'                     : 'org.apache.httpcomponents:httpcore:4.1',
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java
index c451195..78d9d94 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java
@@ -43,6 +43,7 @@ import com.android.sdklib.internal.build.DebugKeyProvider.KeytoolException;
 import com.android.utils.GrabProcessOutput;
 import com.android.utils.GrabProcessOutput.IProcessOutput;
 import com.android.utils.GrabProcessOutput.Wait;
+import com.google.common.base.Charsets;
 import com.google.common.hash.HashCode;
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
@@ -848,7 +849,7 @@ public class BuildHelper {
 
         // add a hash of the original file path
         HashFunction hashFunction = Hashing.md5();
-        HashCode hashCode = hashFunction.hashString(inputFile.getAbsolutePath());
+        HashCode hashCode = hashFunction.hashString(inputFile.getAbsolutePath(), Charsets.UTF_8);
 
         return name + "-" + hashCode.toString() + ".jar";
     }
diff --git a/eclipse/plugins/com.android.ide.eclipse.base/.classpath b/eclipse/plugins/com.android.ide.eclipse.base/.classpath
index fc77c11..de0e2c8 100644
--- a/eclipse/plugins/com.android.ide.eclipse.base/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.base/.classpath
@@ -5,7 +5,7 @@
     <classpathentry exported="true" kind="lib" path="libs/commons-codec-1.4.jar"/>
     <classpathentry exported="true" kind="lib" path="libs/commons-compress-1.0.jar"/>
     <classpathentry exported="true" kind="lib" path="libs/commons-logging-1.1.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="libs/guava-15.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/guava-17.0.jar"/>
     <classpathentry exported="true" kind="lib" path="libs/httpclient-4.1.1.jar"/>
     <classpathentry exported="true" kind="lib" path="libs/httpcore-4.1.jar"/>
     <classpathentry exported="true" kind="lib" path="libs/kxml2-2.3.0.jar"/>
diff --git a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF
index e7c533c..69e0b5f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Bundle-ClassPath: .,
  libs/commons-codec-1.4.jar,
  libs/commons-compress-1.0.jar,
  libs/commons-logging-1.1.1.jar,
- libs/guava-15.0.jar,
+ libs/guava-17.0.jar,
  libs/httpclient-4.1.1.jar,
  libs/httpcore-4.1.jar,
  libs/httpmime-4.1.jar,
@@ -26,16 +26,20 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.android,
  com.android.annotations,
  com.android.annotations.concurrency,
+ com.android.build,
  com.android.dvlib,
+ com.android.ide.common.build,
  com.android.ide.common.internal,
  com.android.ide.common.packaging,
  com.android.ide.common.rendering,
  com.android.ide.common.rendering.api,
  com.android.ide.common.rendering.legacy,
+ com.android.ide.common.repository,
  com.android.ide.common.res2,
  com.android.ide.common.resources,
  com.android.ide.common.resources.configuration,
  com.android.ide.common.sdk,
+ com.android.ide.common.signing,
  com.android.ide.common.xml,
  com.android.ide.eclipse.base,
  com.android.ide.eclipse.base.internal.preferences,
@@ -46,6 +50,7 @@ Export-Package: com.android,
  com.android.sdklib,
  com.android.sdklib.build,
  com.android.sdklib.devices,
+ com.android.sdklib.internal.androidTarget,
  com.android.sdklib.internal.avd,
  com.android.sdklib.internal.build,
  com.android.sdklib.internal.project,
@@ -69,14 +74,18 @@ Export-Package: com.android,
  com.google.common.base.internal,
  com.google.common.cache,
  com.google.common.collect,
+ com.google.common.escape,
  com.google.common.eventbus,
  com.google.common.hash,
+ com.google.common.html,
  com.google.common.io,
  com.google.common.math,
  com.google.common.net,
  com.google.common.primitives,
  com.google.common.reflect,
  com.google.common.util.concurrent,
+ com.google.common.xml,
+ com.google.thirdparty.publicsuffix,
  org.apache.commons.codec,
  org.apache.commons.codec.binary,
  org.apache.commons.codec.digest,
@@ -84,14 +93,23 @@ Export-Package: com.android,
  org.apache.commons.codec.net,
  org.apache.commons.compress.archivers,
  org.apache.commons.compress.archivers.ar,
+ org.apache.commons.compress.archivers.arj,
  org.apache.commons.compress.archivers.cpio,
+ org.apache.commons.compress.archivers.dump,
  org.apache.commons.compress.archivers.jar,
+ org.apache.commons.compress.archivers.sevenz,
  org.apache.commons.compress.archivers.tar,
  org.apache.commons.compress.archivers.zip,
  org.apache.commons.compress.changes,
  org.apache.commons.compress.compressors,
  org.apache.commons.compress.compressors.bzip2,
  org.apache.commons.compress.compressors.gzip,
+ org.apache.commons.compress.compressors.lzma,
+ org.apache.commons.compress.compressors.pack200,
+ org.apache.commons.compress.compressors.snappy,
+ org.apache.commons.compress.compressors.xz,
+ org.apache.commons.compress.compressors.z,
+ org.apache.commons.compress.compressors.z._internal_,
  org.apache.commons.compress.utils,
  org.apache.commons.logging,
  org.apache.commons.logging.impl,
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java
index 2d204eb..c13ab46 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java
@@ -224,13 +224,6 @@ public class CollectTraceAction implements IWorkbenchWindowActionDelegate {
 
     @SuppressWarnings("resource") // Closeables.closeQuietly
     public static void startTracing(Shell shell, TraceOptions traceOptions, int port) {
-        FileOutputStream fos = null;
-        try {
-            fos = new FileOutputStream(traceOptions.traceDestination, false);
-        } catch (FileNotFoundException e) {
-            // input path is valid, so this cannot occur
-        }
-
         Socket socket = new Socket();
         DataInputStream traceDataStream = null;
         DataOutputStream traceCommandsStream = null;
@@ -243,7 +236,6 @@ public class CollectTraceAction implements IWorkbenchWindowActionDelegate {
             MessageDialog.openError(shell,
                     "OpenGL Trace",
                     "Unable to connect to remote GL Trace Server: " + e.getMessage());
-            Closeables.closeQuietly(fos);
             return;
         }
 
@@ -258,10 +250,16 @@ public class CollectTraceAction implements IWorkbenchWindowActionDelegate {
                     "OpenGL Trace",
                     "Unexpected error while setting trace options: " + e.getMessage());
             closeSocket(socket);
-            Closeables.closeQuietly(fos);
             return;
         }
 
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(traceOptions.traceDestination, false);
+        } catch (FileNotFoundException e) {
+            // input path is valid, so this cannot occur
+        }
+
         // create trace writer that writes to a trace file
         TraceFileWriter traceFileWriter = new TraceFileWriter(fos, traceDataStream);
         traceFileWriter.start();