31 files changed, 14 insertions, 55 deletions
diff --git a/common/.classpath b/common/.classpath
index aa9b382..5f63122 100644
--- a/common/.classpath
+++ b/common/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="tests/src"/>
+	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/>
diff --git a/common/.settings/org.eclipse.core.resources.prefs b/common/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 326f5a7..0000000
--- a/common/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Aug 06 17:32:03 PDT 2012
-eclipse.preferences.version=1
-encoding//tests/src/com/android/utils/PositionXmlParserTest.java=UTF-8
diff --git a/common/Android.mk b/common/Android.mk
index c7a3c1f..85bcd60 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -16,7 +16,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
+LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java)
 
 LOCAL_JAR_MANIFEST := manifest.txt
 
@@ -32,5 +32,14 @@ LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
-# Build all sub-directories
-include $(call all-makefiles-under,$(LOCAL_PATH))
+# build the tests
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java)
+
+LOCAL_MODULE := common-tests
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_JAVA_LIBRARIES := common junit
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/common/build.gradle b/common/build.gradle
index a390c9d..4fb6952 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -16,25 +16,6 @@ version = getVersion()
 group = 'com.android.tools'
 archivesBaseName = 'common'
 
-sourceSets {
-    main {
-        java {
-            srcDir 'src'
-        }
-        resources {
-            srcDir 'resources'
-        }
-    }
-    test {
-        java {
-            srcDir 'tests/src'
-        }
-        resources {
-            srcDir 'tests/resources'
-        }
-    }
-}
-
 uploadArchives {
     repositories {
         mavenDeployer {
diff --git a/common/src/com/android/SdkConstants.java b/common/src/main/java/com/android/SdkConstants.java
index 48cecc1..48cecc1 100644
--- a/common/src/com/android/SdkConstants.java
+++ b/common/src/main/java/com/android/SdkConstants.java
diff --git a/common/src/com/android/annotations/NonNull.java b/common/src/main/java/com/android/annotations/NonNull.java
index 973ebb6..973ebb6 100644
--- a/common/src/com/android/annotations/NonNull.java
+++ b/common/src/main/java/com/android/annotations/NonNull.java
diff --git a/common/src/com/android/annotations/NonNullByDefault.java b/common/src/main/java/com/android/annotations/NonNullByDefault.java
index 3db891c..3db891c 100644
--- a/common/src/com/android/annotations/NonNullByDefault.java
+++ b/common/src/main/java/com/android/annotations/NonNullByDefault.java
diff --git a/common/src/com/android/annotations/Nullable.java b/common/src/main/java/com/android/annotations/Nullable.java
index d9c3861..d9c3861 100755
--- a/common/src/com/android/annotations/Nullable.java
+++ b/common/src/main/java/com/android/annotations/Nullable.java
diff --git a/common/src/com/android/annotations/VisibleForTesting.java b/common/src/main/java/com/android/annotations/VisibleForTesting.java
index 7f41d70..7f41d70 100755
--- a/common/src/com/android/annotations/VisibleForTesting.java
+++ b/common/src/main/java/com/android/annotations/VisibleForTesting.java
diff --git a/common/src/com/android/io/FileWrapper.java b/common/src/main/java/com/android/io/FileWrapper.java
index 8be7859..8be7859 100644
--- a/common/src/com/android/io/FileWrapper.java
+++ b/common/src/main/java/com/android/io/FileWrapper.java
diff --git a/common/src/com/android/io/FolderWrapper.java b/common/src/main/java/com/android/io/FolderWrapper.java
index c29c934..c29c934 100644
--- a/common/src/com/android/io/FolderWrapper.java
+++ b/common/src/main/java/com/android/io/FolderWrapper.java
diff --git a/common/src/com/android/io/IAbstractFile.java b/common/src/main/java/com/android/io/IAbstractFile.java
index 6dfc8d8..6dfc8d8 100644
--- a/common/src/com/android/io/IAbstractFile.java
+++ b/common/src/main/java/com/android/io/IAbstractFile.java
diff --git a/common/src/com/android/io/IAbstractFolder.java b/common/src/main/java/com/android/io/IAbstractFolder.java
index 8335ef9..8335ef9 100644
--- a/common/src/com/android/io/IAbstractFolder.java
+++ b/common/src/main/java/com/android/io/IAbstractFolder.java
diff --git a/common/src/com/android/io/IAbstractResource.java b/common/src/main/java/com/android/io/IAbstractResource.java
index e6358ec..e6358ec 100644
--- a/common/src/com/android/io/IAbstractResource.java
+++ b/common/src/main/java/com/android/io/IAbstractResource.java
diff --git a/common/src/com/android/io/StreamException.java b/common/src/main/java/com/android/io/StreamException.java
index 9f632f4..9f632f4 100644
--- a/common/src/com/android/io/StreamException.java
+++ b/common/src/main/java/com/android/io/StreamException.java
diff --git a/common/src/com/android/prefs/AndroidLocation.java b/common/src/main/java/com/android/prefs/AndroidLocation.java
index 6af8e9b..6af8e9b 100644
--- a/common/src/com/android/prefs/AndroidLocation.java
+++ b/common/src/main/java/com/android/prefs/AndroidLocation.java
diff --git a/common/src/com/android/utils/ILogger.java b/common/src/main/java/com/android/utils/ILogger.java
index 7df5d10..7df5d10 100644
--- a/common/src/com/android/utils/ILogger.java
+++ b/common/src/main/java/com/android/utils/ILogger.java
diff --git a/common/src/com/android/utils/NullLogger.java b/common/src/main/java/com/android/utils/NullLogger.java
index 8b1a3d9..8b1a3d9 100644
--- a/common/src/com/android/utils/NullLogger.java
+++ b/common/src/main/java/com/android/utils/NullLogger.java
diff --git a/common/src/com/android/utils/Pair.java b/common/src/main/java/com/android/utils/Pair.java
index 63694de..63694de 100644
--- a/common/src/com/android/utils/Pair.java
+++ b/common/src/main/java/com/android/utils/Pair.java
diff --git a/common/src/com/android/utils/PositionXmlParser.java b/common/src/main/java/com/android/utils/PositionXmlParser.java
index 73574d5..73574d5 100644
--- a/common/src/com/android/utils/PositionXmlParser.java
+++ b/common/src/main/java/com/android/utils/PositionXmlParser.java
diff --git a/common/src/com/android/utils/SdkUtils.java b/common/src/main/java/com/android/utils/SdkUtils.java
index 160f95d..160f95d 100644
--- a/common/src/com/android/utils/SdkUtils.java
+++ b/common/src/main/java/com/android/utils/SdkUtils.java
diff --git a/common/src/com/android/utils/StdLogger.java b/common/src/main/java/com/android/utils/StdLogger.java
index 05eb456..05eb456 100644
--- a/common/src/com/android/utils/StdLogger.java
+++ b/common/src/main/java/com/android/utils/StdLogger.java
diff --git a/common/src/com/android/utils/XmlUtils.java b/common/src/main/java/com/android/utils/XmlUtils.java
index 0969eb1..0969eb1 100644
--- a/common/src/com/android/utils/XmlUtils.java
+++ b/common/src/main/java/com/android/utils/XmlUtils.java
diff --git a/common/src/com/android/xml/AndroidManifest.java b/common/src/main/java/com/android/xml/AndroidManifest.java
index 306471e..306471e 100644
--- a/common/src/com/android/xml/AndroidManifest.java
+++ b/common/src/main/java/com/android/xml/AndroidManifest.java
diff --git a/common/src/com/android/xml/AndroidXPathFactory.java b/common/src/main/java/com/android/xml/AndroidXPathFactory.java
index ee5b87b..ee5b87b 100644
--- a/common/src/com/android/xml/AndroidXPathFactory.java
+++ b/common/src/main/java/com/android/xml/AndroidXPathFactory.java
diff --git a/common/tests/.classpath b/common/src/test/.classpath
index cda1977..7564f2f 100644
--- a/common/tests/.classpath
+++ b/common/src/test/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
diff --git a/common/tests/.project b/common/src/test/.project
index 9f550a3..9f550a3 100644
--- a/common/tests/.project
+++ b/common/src/test/.project
diff --git a/common/tests/src/com/android/utils/PositionXmlParserTest.java b/common/src/test/java/com/android/utils/PositionXmlParserTest.java
index 18eda43..18eda43 100644
--- a/common/tests/src/com/android/utils/PositionXmlParserTest.java
+++ b/common/src/test/java/com/android/utils/PositionXmlParserTest.java
diff --git a/common/tests/src/com/android/utils/SdkUtilsTest.java b/common/src/test/java/com/android/utils/SdkUtilsTest.java
index 030e1b7..030e1b7 100644
--- a/common/tests/src/com/android/utils/SdkUtilsTest.java
+++ b/common/src/test/java/com/android/utils/SdkUtilsTest.java
diff --git a/common/tests/src/com/android/utils/XmlUtilsTest.java b/common/src/test/java/com/android/utils/XmlUtilsTest.java
index 0e9289b..0e9289b 100644
--- a/common/tests/src/com/android/utils/XmlUtilsTest.java
+++ b/common/src/test/java/com/android/utils/XmlUtilsTest.java
diff --git a/common/tests/Android.mk b/common/tests/Android.mk
deleted file mode 100644
index 10e75e8..0000000
--- a/common/tests/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# Only compile source java files in this lib.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_MODULE := common-tests
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_JAVA_LIBRARIES := common junit
-
-include $(BUILD_HOST_JAVA_LIBRARY)