Trim temporary directory root from entry paths when creating resource…

…s srcjar to match standard jar format. -- MOS_MIGRATED_REVID=104498213
bazelbuild · Oct 2, 2015 · 2594c9e · 2594c9e
1 parent 28099de
commit 2594c9e
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
@@ -58,7 +58,7 @@ public class AndroidResourceProcessor {
   public AndroidResourceProcessor(StdLogger stdLogger) {
     this.stdLogger = stdLogger;
   }
-  
+
   /**
    * Copies the R.txt to the expected place.
    */
@@ -85,15 +85,16 @@ public void createSrcJar(Path generatedSourcesRoot, Path srcJar) {
     try {
       Files.createDirectories(srcJar.getParent());
       try (final ZipOutputStream zip = new ZipOutputStream(Files.newOutputStream(srcJar))) {
-        Files.walkFileTree(generatedSourcesRoot, new SymbolFileSrcJarBuildingVisitor(zip));
+        Files.walkFileTree(generatedSourcesRoot,
+            new SymbolFileSrcJarBuildingVisitor(zip, generatedSourcesRoot));
       }
     } catch (IOException e) {
       Throwables.propagate(e);
     }
   }
 
   /**
-   * Processes resources for generated sources, configs and packaging resources. 
+   * Processes resources for generated sources, configs and packaging resources.
    */
   public void processResources(
       AndroidBuilder builder,
@@ -196,7 +197,7 @@ public MergedAndroidData mergeData(
       set.loadFromFiles(stdLogger);
       merger.addDataSet(set);
     }
-    
+
     AssetMerger assetMerger = new AssetMerger();
     for (AssetSet set : assetSets) {
       set.loadFromFiles(stdLogger);
@@ -252,7 +253,7 @@ private String prepareOutputPath(@Nullable Path out) throws IOException {
     }
     return Files.createDirectories(out).toString();
   }
-  
+
   /**
    * A FileVisitor that will add all R.java files to be stored in a zip archive.
    */
@@ -261,16 +262,18 @@ private final class SymbolFileSrcJarBuildingVisitor extends SimpleFileVisitor<Pa
     // The earliest date representable in a zip file, 1-1-1980.
     private static final long ZIP_EPOCH = 315561600000L;
     private final ZipOutputStream zip;
+    private final Path root;
 
-    private SymbolFileSrcJarBuildingVisitor(ZipOutputStream zip) {
+    private SymbolFileSrcJarBuildingVisitor(ZipOutputStream zip, Path root) {
       this.zip = zip;
+      this.root = root;
     }
 
     @Override
     public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
       if (file.getFileName().endsWith("R.java")) {
         byte[] content = Files.readAllBytes(file);
-        ZipEntry entry = new ZipEntry(file.toString());
+        ZipEntry entry = new ZipEntry(root.relativize(file).toString());
 
         entry.setMethod(ZipEntry.STORED);
         entry.setTime(ZIP_EPOCH);