Remove GwtIncompatible from EmulatedCharset.
Change-Id: I171da06d9a99ff617fb4f35d8108088bfb43bc24
Review-Link: https://gwt-review.googlesource.com/#/c/14221/
diff --git a/dev/BUILD b/dev/BUILD
index bbb6c87..de10940 100644
--- a/dev/BUILD
+++ b/dev/BUILD
@@ -216,6 +216,7 @@
exclude = [
"core/super/com/google/gwt/dev/jjs/intrinsic/**",
"**/package-info.java",
+ "**/EmulatedCharset.java",
],
),
compatible_with = ["//buildenv/target:android"],
diff --git a/dev/build.xml b/dev/build.xml
index d38cf1f..9dfd13c 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -176,7 +176,7 @@
<target name="compiler.standalone"
description="Validates that the standalone gwt-compiler project can build.">
<mkdir dir="${javac.out}"/>
- <gwt.javac srcdir="core/super" excludes="com/google/gwt/dev/jjs/intrinsic/"/>
+ <gwt.javac srcdir="core/super" excludes="com/google/gwt/dev/jjs/intrinsic/,**/EmulatedCharset.java"/>
<gwt.javac srcdir="core/src">
<include name="com/google/gwt/core/ext/**"/>
<include name="com/google/gwt/core/linker/**"/>
diff --git a/dev/core/super/javaemul/internal/EmulatedCharset.java b/dev/core/super/javaemul/internal/EmulatedCharset.java
index 210543e..ddde0fa 100644
--- a/dev/core/super/javaemul/internal/EmulatedCharset.java
+++ b/dev/core/super/javaemul/internal/EmulatedCharset.java
@@ -16,10 +16,6 @@
package javaemul.internal;
import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-
-import javaemul.internal.annotations.GwtIncompatible;
/**
* Provides Charset implementations.
@@ -202,22 +198,4 @@
public abstract byte[] getBytes(String string);
public abstract char[] decodeString(byte[] bytes, int ofs, int len);
-
- /* Following methods are included to keep the package compilable with javac */
-
- @GwtIncompatible
- public CharsetEncoder newEncoder() {
- throw new UnsupportedOperationException();
- }
-
- @GwtIncompatible
- public CharsetDecoder newDecoder() {
- throw new UnsupportedOperationException();
- }
-
- @GwtIncompatible
- public boolean contains(Charset cs) {
- throw new UnsupportedOperationException();
- }
}
-
