Refactor common.jar

Move resources and com.android.util.Pair into layoutlib_api
where they belong since layoutlib depends on them and we need
to control the API.

Made a copy of Pair to stay in common.jar but moved it to
com.android.utils.Pair (the one in com.android.util.Pair is
marked as deprecated to prevent usage where applicable).

Also moved XmlUtil and PositionXmlParser to com.android.utils
to match Pair.

Change-Id: I21d7057d3f2ce604f86a3bb1fa3c130948c93b89

2 files changed, 5 insertions, 5 deletions

diff --git a/lint/cli/etc/manifest.txt b/lint/cli/etc/manifest.txt
index 2b7965a..5f10a7e 100644
--- a/lint/cli/etc/manifest.txt
+++ b/lint/cli/etc/manifest.txt
@@ -1,2 +1,2 @@
 Main-Class: com.android.tools.lint.Main
-Class-Path: common.jar lint_api.jar lint_checks.jar asm-4.0.jar asm-tree-4.0.jar asm-analysis-4.0.jar guava-10.0.1.jar lombok-ast-0.2.jar
+Class-Path: common.jar layout_lib.jar lint_api.jar lint_checks.jar asm-4.0.jar asm-tree-4.0.jar asm-analysis-4.0.jar guava-10.0.1.jar lombok-ast-0.2.jar
diff --git a/lint/cli/src/com/android/tools/lint/LintCliXmlParser.java b/lint/cli/src/com/android/tools/lint/LintCliXmlParser.java
index 8611019..d8f413a 100644
--- a/lint/cli/src/com/android/tools/lint/LintCliXmlParser.java
+++ b/lint/cli/src/com/android/tools/lint/LintCliXmlParser.java
@@ -23,7 +23,7 @@ import com.android.tools.lint.client.api.IssueRegistry;
 import com.android.tools.lint.detector.api.Location;
 import com.android.tools.lint.detector.api.Location.Handle;
 import com.android.tools.lint.detector.api.XmlContext;
-import com.android.util.PositionXmlParser;
+import com.android.utils.PositionXmlParser;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -119,7 +119,7 @@ public class LintCliXmlParser extends PositionXmlParser implements IDomParser {
          * Linked position: for a begin offset this will point to the end
          * offset, and for an end offset this will be null
          */
-        private com.android.util.PositionXmlParser.Position mEnd;
+        private com.android.utils.PositionXmlParser.Position mEnd;
 
         /**
          * Creates a new {@link OffsetPosition}
@@ -150,12 +150,12 @@ public class LintCliXmlParser extends PositionXmlParser implements IDomParser {
         }
 
         @Override
-        public com.android.util.PositionXmlParser.Position getEnd() {
+        public com.android.utils.PositionXmlParser.Position getEnd() {
             return mEnd;
         }
 
         @Override
-        public void setEnd(@NonNull com.android.util.PositionXmlParser.Position end) {
+        public void setEnd(@NonNull com.android.utils.PositionXmlParser.Position end) {
             mEnd = end;
         }