aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java
diff options
context:
space:
mode:
authorGravatar Kevin Bierhoff <kmb@google.com>2017-03-25 03:08:49 +0000
committerGravatar Philipp Wollermann <philwo@google.com>2017-03-27 11:36:58 +0000
commitebebec3fd5ddc89a89bda5684e3c3e1c1d5cd376 (patch)
tree7aed07056baf1d8e2d72329a8339a495c61a1674 /src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java
parentc70a1e70093cd5a9c3791e24cd895057125447f9 (diff)
Remove disabled fallback logic from DexFileMerger.
-- PiperOrigin-RevId: 151201374 MOS_MIGRATED_REVID=151201374
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java')
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java
index ed0971c8b8..cfc06885bf 100644
--- a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java
+++ b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java
@@ -14,7 +14,6 @@
package com.google.devtools.build.android.dexer;
import com.android.dex.Dex;
-import com.android.dx.dex.file.DexFile;
import com.google.common.io.ByteStreams;
import java.io.Closeable;
import java.io.IOException;
@@ -45,13 +44,6 @@ class DexFileArchive implements Closeable {
}
/**
- * Serializes and adds a {@code .dex} file with the given details.
- */
- public DexFileArchive addFile(ZipEntry entry, DexFile dex) throws IOException {
- return addFile(entry, DexFiles.encode(dex));
- }
-
- /**
* Adds a {@code .dex} file with the given details.
*/
public DexFileArchive addFile(ZipEntry entry, Dex dex) throws IOException {
@@ -66,12 +58,4 @@ class DexFileArchive implements Closeable {
public void close() throws IOException {
out.close();
}
-
- private DexFileArchive addFile(ZipEntry entry, byte[] content) throws IOException {
- entry.setSize(content.length);
- out.putNextEntry(entry);
- out.write(content);
- out.closeEntry();
- return this;
- }
}