diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2014-12-05 17:40:45 +0100 |
|---|---|---|
| committer | Benoit Lamarche <benoitlamarche@google.com> | 2014-12-08 16:14:24 +0100 |
| commit | ad9331fcab275f81b0d2de1bf521ae58a8db499f (patch) | |
| tree | 60062057bbd541e71ba200b42829b5453f4f132d /jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java | |
| parent | 5762722f5aab6eaef61d8bf009145dfb83b0557a (diff) | |
| download | toolchain_jack-ad9331fcab275f81b0d2de1bf521ae58a8db499f.tar.gz toolchain_jack-ad9331fcab275f81b0d2de1bf521ae58a8db499f.tar.bz2 toolchain_jack-ad9331fcab275f81b0d2de1bf521ae58a8db499f.zip | |
Handle collisions in ResourceImporter
Change-Id: I4767473e0b9bbac513df1b1e98f77c7eaa1d90a8
Diffstat (limited to 'jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java')
| -rw-r--r-- | jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java index ccce9392..b45c4f76 100644 --- a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java +++ b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java @@ -22,15 +22,15 @@ import com.android.jack.ProguardFlags; import com.android.jack.TestTools; import com.android.jack.backend.jayce.ImportConflictException; import com.android.jack.backend.jayce.JayceFileImporter; -import com.android.jack.backend.jayce.ResourceImportConflictException; import com.android.jack.test.category.KnownBugs; import com.android.jack.library.FileType; import com.android.jack.library.JackLibrary; +import com.android.jack.resource.ResourceImportConflictException; +import com.android.jack.resource.ResourceImporter; import com.android.jack.shrob.obfuscation.NameProviderFactory; import com.android.jack.test.toolchain.AbstractTestTools; import com.android.jack.test.toolchain.IToolchain; import com.android.jack.test.toolchain.JackApiToolchain; -import com.android.jack.test.toolchain.JackBasedToolchain; import com.android.sched.util.stream.ByteStreamSucker; import junit.framework.Assert; @@ -480,7 +480,7 @@ public class FileConflictTests { options.setJayceOutputDir(jackOutput); } if (collisionPolicy != null) { - options.addProperty(JayceFileImporter.RESOURCE_COLLISION_POLICY.getName(), collisionPolicy); + options.addProperty(ResourceImporter.RESOURCE_COLLISION_POLICY.getName(), collisionPolicy); } Jack.run(options); } |