Rebase android-json to avoid conflicts with org.json. This patch rebases android-json from org.json to c.g.g.thirdparty.json. In the future it will probably make sense to migrate to unrebased GSON. Bug: issue 8762. Change-Id: I47352cebdd8d8092dd512f2bd6b623ff8022d854
diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath index e0d44b3..4441746 100644 --- a/eclipse/dev/.classpath +++ b/eclipse/dev/.classpath
@@ -23,9 +23,9 @@ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118/sourcemap-rebased.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118/compiler-rebased.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/json/android-sdk-19.1/json-android.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/compiler-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/json/android-sdk-19.1/json-android-rebased.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-collections-3.2.1.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/> <classpathentry kind="output" path="bin"/>