diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-10-22 10:54:16 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-10-22 10:54:16 -0700 |
| commit | 76e0b61e01de334ec13a48b5c2ce6d81707e743d (patch) | |
| tree | 297be0f38aba6a34fee0ddeb9707abf8d27d9a15 | |
| parent | fd836ebcd985b08baa85caad03f9ad86eb40ef83 (diff) | |
| parent | f23caf19dbb20c188573b83043f5f68a63727544 (diff) | |
| download | sdk-76e0b61e01de334ec13a48b5c2ce6d81707e743d.zip sdk-76e0b61e01de334ec13a48b5c2ce6d81707e743d.tar.gz sdk-76e0b61e01de334ec13a48b5c2ce6d81707e743d.tar.bz2 | |
Merge "Remove temporary disabling of proguard during ADT export." into tools_r8
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ExportHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ExportHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ExportHelper.java index 0cfd84f..cdfe3b3 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ExportHelper.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ExportHelper.java @@ -181,7 +181,7 @@ public final class ExportHelper { new File(project.getLocation().toFile(), SdkConstants.FD_PROGUARD)); // dx input is proguard's output - dxInput = new String[] { inputJar/*obfuscatedJar*/.getAbsolutePath() }; + dxInput = new String[] { obfuscatedJar.getAbsolutePath() }; } else { // no proguard, simply get all the compiled code path: project output(s) + // jar file(s) |