Refactor dvlib folder structure.

Move folders around to match default gradle/maven
folder structure.

The custom structure confused some IDEs when importing
the project as a Gradle project.

Change-Id: I348e527012ab3268127efbbe4cb682b7bad2306f

20 files changed, 19 insertions, 54 deletions

diff --git a/device_validator/dvlib/.classpath b/device_validator/dvlib/.classpath
index 88fb9b4..4e9eca4 100644
--- a/device_validator/dvlib/.classpath
+++ b/device_validator/dvlib/.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="output" path="bin"/>
diff --git a/device_validator/dvlib/Android.mk b/device_validator/dvlib/Android.mk
index 1869adb..aad91f6 100644
--- a/device_validator/dvlib/Android.mk
+++ b/device_validator/dvlib/Android.mk
@@ -15,12 +15,27 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_RESOURCE_DIRS := src
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
+LOCAL_JAVA_RESOURCE_DIRS := src/main/resources
 
 LOCAL_MODULE := dvlib
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
+
+# Build tests
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java)
+LOCAL_JAVA_RESOURCE_DIRS := src/main/resources
+
+LOCAL_MODULE := dvlib-tests
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_JAVA_LIBRARIES := \
+	dvlib \
+	junit
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/device_validator/dvlib/build.gradle b/device_validator/dvlib/build.gradle
index 0486fa6..df955ce 100644
--- a/device_validator/dvlib/build.gradle
+++ b/device_validator/dvlib/build.gradle
@@ -14,25 +14,6 @@ version = getVersion()
 group = 'com.android.tools'
 archivesBaseName = 'dvlib'
 
-sourceSets {
-    main {
-        java {
-            srcDir 'src'
-        }
-        resources {
-            srcDir 'src'
-        }
-    }
-    test {
-        java {
-            srcDir 'tests/src'
-        }
-        resources {
-            srcDir 'tests/src'
-        }
-   }
-}
-
 uploadArchives {
     repositories {
         mavenDeployer {
diff --git a/device_validator/dvlib/src/com/android/dvlib/DeviceSchema.java b/device_validator/dvlib/src/main/java/com/android/dvlib/DeviceSchema.java
index b02471b..b02471b 100644
--- a/device_validator/dvlib/src/com/android/dvlib/DeviceSchema.java
+++ b/device_validator/dvlib/src/main/java/com/android/dvlib/DeviceSchema.java
diff --git a/device_validator/dvlib/src/com/android/dvlib/devices.xsd b/device_validator/dvlib/src/main/resources/com/android/dvlib/devices.xsd
index d4678da..d4678da 100644
--- a/device_validator/dvlib/src/com/android/dvlib/devices.xsd
+++ b/device_validator/dvlib/src/main/resources/com/android/dvlib/devices.xsd
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/DeviceSchemaTest.java b/device_validator/dvlib/src/test/java/com/android/dvlib/DeviceSchemaTest.java
index de70ef3..de70ef3 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/DeviceSchemaTest.java
+++ b/device_validator/dvlib/src/test/java/com/android/dvlib/DeviceSchemaTest.java
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices.xml b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices.xml
index 6662099..6662099 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices.xml
+++ b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices.xml
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_minimal.xml b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices_minimal.xml
index e063fd1..e063fd1 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_minimal.xml
+++ b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices_minimal.xml
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_default.xml b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices_no_default.xml
index 605a6c1..605a6c1 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_default.xml
+++ b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices_no_default.xml
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_hardware.xml b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices_no_hardware.xml
index fb133ad..fb133ad 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_hardware.xml
+++ b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices_no_hardware.xml
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_software.xml b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices_no_software.xml
index ae709bb..ae709bb 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_software.xml
+++ b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices_no_software.xml
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_states.xml b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices_no_states.xml
index 8685e3b..8685e3b 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_states.xml
+++ b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices_no_states.xml
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_too_many_defaults.xml b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices_too_many_defaults.xml
index c720a7a..c720a7a 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_too_many_defaults.xml
+++ b/device_validator/dvlib/src/test/resources/com/android/dvlib/devices_too_many_defaults.xml
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/extras/frame.jpeg b/device_validator/dvlib/src/test/resources/com/android/dvlib/extras/frame.jpeg
index e69de29..e69de29 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/extras/frame.jpeg
+++ b/device_validator/dvlib/src/test/resources/com/android/dvlib/extras/frame.jpeg
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/extras/frame.png b/device_validator/dvlib/src/test/resources/com/android/dvlib/extras/frame.png
index e69de29..e69de29 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/extras/frame.png
+++ b/device_validator/dvlib/src/test/resources/com/android/dvlib/extras/frame.png
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/extras/sixteen.jpeg b/device_validator/dvlib/src/test/resources/com/android/dvlib/extras/sixteen.jpeg
index e69de29..e69de29 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/extras/sixteen.jpeg
+++ b/device_validator/dvlib/src/test/resources/com/android/dvlib/extras/sixteen.jpeg
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/extras/sixteen.png b/device_validator/dvlib/src/test/resources/com/android/dvlib/extras/sixteen.png
index e69de29..e69de29 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/extras/sixteen.png
+++ b/device_validator/dvlib/src/test/resources/com/android/dvlib/extras/sixteen.png
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/extras/sixtyfour.jpeg b/device_validator/dvlib/src/test/resources/com/android/dvlib/extras/sixtyfour.jpeg
index e69de29..e69de29 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/extras/sixtyfour.jpeg
+++ b/device_validator/dvlib/src/test/resources/com/android/dvlib/extras/sixtyfour.jpeg
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/extras/sixtyfour.png b/device_validator/dvlib/src/test/resources/com/android/dvlib/extras/sixtyfour.png
index e69de29..e69de29 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/extras/sixtyfour.png
+++ b/device_validator/dvlib/src/test/resources/com/android/dvlib/extras/sixtyfour.png
diff --git a/device_validator/dvlib/tests/Android.mk b/device_validator/dvlib/tests/Android.mk
deleted file mode 100644
index 5094d7a..0000000
--- a/device_validator/dvlib/tests/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2012 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)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_RESOURCE_DIRS := src
-
-LOCAL_MODULE := dvlib-tests
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_JAVA_LIBRARIES := \
-	dvlib \
-	junit
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))