Merge

Author: ngmiceli-g

google-http-client-assembly/assembly.xml

@@ -9,35 +9,40 @@
   <files>
     <file>
       <source>LICENSE.txt</source>
+      <outputDirectory>google-http-java-client</outputDirectory>
     </file>
     <file>
       <source>classpath-include</source>
       <filtered>true</filtered>
+      <outputDirectory>google-http-java-client</outputDirectory>
     </file>
     <file>
       <source>proguard-google-http-client.txt</source>
+      <outputDirectory>google-http-java-client</outputDirectory>
     </file>
     <file>
       <source>readme.html</source>
       <filtered>true</filtered>
+      <outputDirectory>google-http-java-client</outputDirectory>
     </file>
   </files>
   <fileSets>
     <fileSet>
       <directory>dependencies</directory>
+      <outputDirectory>google-http-java-client/dependencies</outputDirectory>
     </fileSet>
     <fileSet>
       <directory>target/libs</directory>
-      <outputDirectory>libs</outputDirectory>
+      <outputDirectory>google-http-java-client/libs</outputDirectory>
     </fileSet>
     <fileSet>
       <directory>android-properties</directory>
-      <outputDirectory>libs</outputDirectory>
+      <outputDirectory>google-http-java-client/libs</outputDirectory>
       <filtered>true</filtered>
     </fileSet>
     <fileSet>
       <directory>target/libs-sources</directory>
-      <outputDirectory>libs-sources</outputDirectory>
+      <outputDirectory>google-http-java-client/libs-sources</outputDirectory>
     </fileSet>
   </fileSets>
 </assembly>