summaryrefslogtreecommitdiffstats
path: root/jack-tests
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2015-03-18 10:10:28 +0100
committerYohann Roussel <yroussel@google.com>2015-03-18 10:10:28 +0100
commit1b8254098dd432b2837686d89376f9b427763aea (patch)
tree8e9b34f1e971e59a4f007dc1dd46efe8fa93d113 /jack-tests
parent9f6adb589ae3a3a1bb332019f79f106b3e153284 (diff)
downloadtoolchain_jack-1b8254098dd432b2837686d89376f9b427763aea.zip
toolchain_jack-1b8254098dd432b2837686d89376f9b427763aea.tar.gz
toolchain_jack-1b8254098dd432b2837686d89376f9b427763aea.tar.bz2
Remove reference to StandardCharsets
Since it's java 7. Change-Id: Iaee93f5e074c0fb4c7dead6aee51a95e4660c7d6
Diffstat (limited to 'jack-tests')
-rw-r--r--jack-tests/tests/com/android/jack/shrob/RepackagingTest.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java b/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java
index 6fd3228..f9253bd 100644
--- a/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java
+++ b/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java
@@ -29,13 +29,15 @@ import com.android.jack.test.toolchain.JackApiToolchainBase;
import java.io.File;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
import java.util.List;
import javax.annotation.Nonnull;
public class RepackagingTest extends AbstractTest {
+ private static final Charset UTF8 = Charset.forName("UTF-8");
+
@Override
protected void runTest(
@Nonnull String testNumber,
@@ -73,10 +75,10 @@ public class RepackagingTest extends AbstractTest {
@Nonnull String flagNumber) throws IOException {
File result = AbstractTestTools.createTempFile("proguard" + flagNumber, ".flags" + flagNumber);
- List<String> lines = Files.readLines(inFlags, StandardCharsets.UTF_8);
+ List<String> lines = Files.readLines(inFlags, UTF8);
String fileAsOneLine = Joiner.on(' ').join(lines);
String resultContent = fileAsOneLine.replaceAll("-repackageclasses\\s+'.+'", "-repackageclasses ''");
- Files.write(resultContent, result, StandardCharsets.UTF_8);
+ Files.write(resultContent, result, UTF8);
return result;
}