diff --git a/common/.classpath b/common/.classpath index aa9b382d30dd27b9dbc39f7b81243bf9e9882622..5f63122850e9b18c2a78ed7e9f01ad7e6d92a043 100644 --- a/common/.classpath +++ b/common/.classpath @@ -1,7 +1,6 @@ - - + diff --git a/common/.settings/org.eclipse.core.resources.prefs b/common/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 326f5a71ac48a879c29b00731bd6dc6d33d6b1c7..0000000000000000000000000000000000000000 --- 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 c7a3c1f81abf7b9a8a50f8bcb4f3ac323a8f2518..85bcd60a90ba4893bcdf6ac6ee76ac49c05e7c0a 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 a390c9d1e76626d4350b64e50dc92727e7f94b5c..4fb6952776f7a309e598712c3756404636c2df49 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 similarity index 100% rename from common/src/com/android/SdkConstants.java rename to 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 similarity index 100% rename from common/src/com/android/annotations/NonNull.java rename to 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 similarity index 100% rename from common/src/com/android/annotations/NonNullByDefault.java rename to 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 similarity index 100% rename from common/src/com/android/annotations/Nullable.java rename to 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 similarity index 100% rename from common/src/com/android/annotations/VisibleForTesting.java rename to 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 similarity index 100% rename from common/src/com/android/io/FileWrapper.java rename to 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 similarity index 100% rename from common/src/com/android/io/FolderWrapper.java rename to 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 similarity index 100% rename from common/src/com/android/io/IAbstractFile.java rename to 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 similarity index 100% rename from common/src/com/android/io/IAbstractFolder.java rename to 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 similarity index 100% rename from common/src/com/android/io/IAbstractResource.java rename to 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 similarity index 100% rename from common/src/com/android/io/StreamException.java rename to 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 similarity index 100% rename from common/src/com/android/prefs/AndroidLocation.java rename to 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 similarity index 100% rename from common/src/com/android/utils/ILogger.java rename to 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 similarity index 100% rename from common/src/com/android/utils/NullLogger.java rename to 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 similarity index 100% rename from common/src/com/android/utils/Pair.java rename to 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 similarity index 100% rename from common/src/com/android/utils/PositionXmlParser.java rename to 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 similarity index 100% rename from common/src/com/android/utils/SdkUtils.java rename to 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 similarity index 100% rename from common/src/com/android/utils/StdLogger.java rename to 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 similarity index 100% rename from common/src/com/android/utils/XmlUtils.java rename to 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 similarity index 100% rename from common/src/com/android/xml/AndroidManifest.java rename to 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 similarity index 100% rename from common/src/com/android/xml/AndroidXPathFactory.java rename to common/src/main/java/com/android/xml/AndroidXPathFactory.java diff --git a/layoutlib_api/tests/.classpath b/common/src/test/.classpath similarity index 92% rename from layoutlib_api/tests/.classpath rename to common/src/test/.classpath index cda19778dfb61287c5db20fe8febdab5ed702d35..7564f2f56e02b34141741d373d5ac4c3021114ab 100644 --- a/layoutlib_api/tests/.classpath +++ b/common/src/test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/common/tests/.project b/common/src/test/.project similarity index 100% rename from common/tests/.project rename to 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 similarity index 100% rename from common/tests/src/com/android/utils/PositionXmlParserTest.java rename to 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 similarity index 100% rename from common/tests/src/com/android/utils/SdkUtilsTest.java rename to 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 similarity index 100% rename from common/tests/src/com/android/utils/XmlUtilsTest.java rename to 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 10e75e88e158aa3320684661397b6869c0af55d2..0000000000000000000000000000000000000000 --- 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) diff --git a/ddms/libs/ddmlib/.classpath b/ddms/libs/ddmlib/.classpath index 22d024198ce36f37def282210e121ac2fe560ad1..ebdb5af31ae4f6ae721931737af640b5b4a03ed4 100644 --- a/ddms/libs/ddmlib/.classpath +++ b/ddms/libs/ddmlib/.classpath @@ -1,6 +1,6 @@ - + diff --git a/ddms/libs/ddmlib/Android.mk b/ddms/libs/ddmlib/Android.mk index 929522e36bd9b39f964be38ac8585536e561720a..c0191f95094e47cd1cc55207f560fa447a1b1adc 100644 --- a/ddms/libs/ddmlib/Android.mk +++ b/ddms/libs/ddmlib/Android.mk @@ -17,8 +17,8 @@ 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_JAVA_RESOURCE_DIRS := src +LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) +LOCAL_JAVA_RESOURCE_DIRS := src/main/java LOCAL_JAVA_LIBRARIES := kxml2-2.3.0 @@ -26,5 +26,19 @@ LOCAL_MODULE := ddmlib include $(BUILD_HOST_JAVA_LIBRARY) +# Build tests + +include $(CLEAR_VARS) + +# Only compile source java files in this lib. +LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java) + +LOCAL_MODULE := ddmlib-tests +LOCAL_MODULE_TAGS := optional + +LOCAL_JAVA_LIBRARIES := ddmlib junit easymock + +include $(BUILD_HOST_JAVA_LIBRARY) + # Build all sub-directories include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/ddms/libs/ddmlib/build.gradle b/ddms/libs/ddmlib/build.gradle index ab07f7080562d0cf8d72e491593db70ca32d3591..c46cdb4c65ea89c69a4584cdc71e679f13fddfb4 100644 --- a/ddms/libs/ddmlib/build.gradle +++ b/ddms/libs/ddmlib/build.gradle @@ -18,22 +18,8 @@ group = 'com.android.tools.ddms' archivesBaseName = 'ddmlib' sourceSets { - main { - java { - srcDir 'src' - } - resources { - srcDir 'src' - } - } - test { - java { - srcDir 'tests/src' - } - resources { - srcDir 'tests/src' - } - } + main.resources.srcDir 'src/main/java' + test.resources.srcDir 'src/test/java' } uploadArchives { diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/AdbCommandRejectedException.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/AdbCommandRejectedException.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/AdbCommandRejectedException.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/AdbCommandRejectedException.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/AdbHelper.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/AdbHelper.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/AdbHelper.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/AdbHelper.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/AllocationInfo.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/AllocationInfo.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/AllocationInfo.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/AllocationInfo.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/AndroidDebugBridge.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/AndroidDebugBridge.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/AndroidDebugBridge.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/AndroidDebugBridge.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/BadPacketException.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/BadPacketException.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/BadPacketException.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/BadPacketException.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/CanceledException.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/CanceledException.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/CanceledException.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/CanceledException.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/ChunkHandler.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/ChunkHandler.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/ChunkHandler.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/ChunkHandler.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/Client.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/Client.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/Client.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/Client.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/ClientData.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/ClientData.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/ClientData.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/ClientData.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/CollectingOutputReceiver.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/CollectingOutputReceiver.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/CollectingOutputReceiver.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/CollectingOutputReceiver.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/DdmConstants.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/DdmConstants.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/DdmConstants.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/DdmConstants.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/DdmPreferences.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/DdmPreferences.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/DdmPreferences.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/DdmPreferences.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/DebugPortManager.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/DebugPortManager.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/DebugPortManager.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/DebugPortManager.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/Debugger.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/Debugger.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/Debugger.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/Debugger.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/Device.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/Device.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/Device.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/Device.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/DeviceMonitor.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/DeviceMonitor.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/DeviceMonitor.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/DeviceMonitor.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/EmulatorConsole.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/EmulatorConsole.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/EmulatorConsole.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/EmulatorConsole.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/FileListingService.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/FileListingService.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/FileListingService.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/FileListingService.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/GetPropReceiver.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/GetPropReceiver.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/GetPropReceiver.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/GetPropReceiver.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/HandleAppName.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleAppName.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/HandleAppName.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleAppName.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/HandleExit.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleExit.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/HandleExit.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleExit.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/HandleHeap.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleHeap.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/HandleHeap.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleHeap.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/HandleHello.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleHello.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/HandleHello.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleHello.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/HandleNativeHeap.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleNativeHeap.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/HandleNativeHeap.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleNativeHeap.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/HandleProfiling.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleProfiling.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/HandleProfiling.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleProfiling.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/HandleTest.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleTest.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/HandleTest.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleTest.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/HandleThread.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleThread.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/HandleThread.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleThread.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/HandleWait.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleWait.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/HandleWait.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HandleWait.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/HeapSegment.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HeapSegment.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/HeapSegment.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/HeapSegment.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/IDevice.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/IDevice.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/IDevice.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/IDevice.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/IShellOutputReceiver.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/IShellOutputReceiver.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/IShellOutputReceiver.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/IShellOutputReceiver.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/IStackTraceInfo.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/IStackTraceInfo.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/IStackTraceInfo.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/IStackTraceInfo.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/InstallException.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/InstallException.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/InstallException.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/InstallException.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/JdwpPacket.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/JdwpPacket.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/JdwpPacket.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/JdwpPacket.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/Log.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/Log.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/Log.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/Log.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/MonitorThread.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/MonitorThread.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/MonitorThread.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/MonitorThread.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/MultiLineReceiver.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/MultiLineReceiver.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/MultiLineReceiver.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/MultiLineReceiver.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/NativeAllocationInfo.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/NativeAllocationInfo.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/NativeAllocationInfo.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/NativeAllocationInfo.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/NativeLibraryMapInfo.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/NativeLibraryMapInfo.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/NativeLibraryMapInfo.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/NativeLibraryMapInfo.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/NativeStackCallInfo.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/NativeStackCallInfo.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/NativeStackCallInfo.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/NativeStackCallInfo.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/NullOutputReceiver.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/NullOutputReceiver.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/NullOutputReceiver.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/NullOutputReceiver.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/RawImage.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/RawImage.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/RawImage.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/RawImage.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/ShellCommandUnresponsiveException.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/ShellCommandUnresponsiveException.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/ShellCommandUnresponsiveException.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/ShellCommandUnresponsiveException.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/SyncException.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/SyncException.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/SyncException.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/SyncException.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/SyncService.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/SyncService.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/SyncService.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/SyncService.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/ThreadInfo.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/ThreadInfo.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/ThreadInfo.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/ThreadInfo.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/TimeoutException.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/TimeoutException.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/TimeoutException.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/TimeoutException.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/log/EventContainer.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/EventContainer.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/log/EventContainer.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/EventContainer.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/log/EventLogParser.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/EventLogParser.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/log/EventLogParser.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/EventLogParser.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/log/EventValueDescription.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/EventValueDescription.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/log/EventValueDescription.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/EventValueDescription.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/log/GcEventContainer.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/GcEventContainer.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/log/GcEventContainer.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/GcEventContainer.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/log/InvalidTypeException.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/InvalidTypeException.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/log/InvalidTypeException.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/InvalidTypeException.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/log/InvalidValueTypeException.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/InvalidValueTypeException.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/log/InvalidValueTypeException.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/InvalidValueTypeException.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/log/LogReceiver.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/LogReceiver.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/log/LogReceiver.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/log/LogReceiver.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/IRemoteAndroidTestRunner.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/IRemoteAndroidTestRunner.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/IRemoteAndroidTestRunner.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/IRemoteAndroidTestRunner.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/ITestRunListener.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/ITestRunListener.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/ITestRunListener.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/ITestRunListener.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/InstrumentationResultParser.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/InstrumentationResultParser.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/InstrumentationResultParser.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/InstrumentationResultParser.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/RemoteAndroidTestRunner.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/RemoteAndroidTestRunner.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/RemoteAndroidTestRunner.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/RemoteAndroidTestRunner.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/TestIdentifier.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/TestIdentifier.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/TestIdentifier.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/TestIdentifier.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/TestResult.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/TestResult.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/TestResult.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/TestResult.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/TestRunResult.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/TestRunResult.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/TestRunResult.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/TestRunResult.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/XmlTestRunListener.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/XmlTestRunListener.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/XmlTestRunListener.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/testrunner/XmlTestRunListener.java diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/utils/ArrayHelper.java b/ddms/libs/ddmlib/src/main/java/com/android/ddmlib/utils/ArrayHelper.java similarity index 100% rename from ddms/libs/ddmlib/src/com/android/ddmlib/utils/ArrayHelper.java rename to ddms/libs/ddmlib/src/main/java/com/android/ddmlib/utils/ArrayHelper.java diff --git a/ddms/libs/ddmlib/tests/.classpath b/ddms/libs/ddmlib/src/test/.classpath similarity index 100% rename from ddms/libs/ddmlib/tests/.classpath rename to ddms/libs/ddmlib/src/test/.classpath diff --git a/ddms/libs/ddmlib/tests/.project b/ddms/libs/ddmlib/src/test/.project similarity index 100% rename from ddms/libs/ddmlib/tests/.project rename to ddms/libs/ddmlib/src/test/.project diff --git a/ddms/libs/ddmlib/tests/src/com/android/ddmlib/EmulatorConsoleTest.java b/ddms/libs/ddmlib/src/test/java/com/android/ddmlib/EmulatorConsoleTest.java similarity index 100% rename from ddms/libs/ddmlib/tests/src/com/android/ddmlib/EmulatorConsoleTest.java rename to ddms/libs/ddmlib/src/test/java/com/android/ddmlib/EmulatorConsoleTest.java diff --git a/ddms/libs/ddmlib/tests/src/com/android/ddmlib/testrunner/InstrumentationResultParserTest.java b/ddms/libs/ddmlib/src/test/java/com/android/ddmlib/testrunner/InstrumentationResultParserTest.java similarity index 100% rename from ddms/libs/ddmlib/tests/src/com/android/ddmlib/testrunner/InstrumentationResultParserTest.java rename to ddms/libs/ddmlib/src/test/java/com/android/ddmlib/testrunner/InstrumentationResultParserTest.java diff --git a/ddms/libs/ddmlib/tests/src/com/android/ddmlib/testrunner/RemoteAndroidTestRunnerTest.java b/ddms/libs/ddmlib/src/test/java/com/android/ddmlib/testrunner/RemoteAndroidTestRunnerTest.java similarity index 100% rename from ddms/libs/ddmlib/tests/src/com/android/ddmlib/testrunner/RemoteAndroidTestRunnerTest.java rename to ddms/libs/ddmlib/src/test/java/com/android/ddmlib/testrunner/RemoteAndroidTestRunnerTest.java diff --git a/ddms/libs/ddmlib/tests/src/com/android/ddmlib/testrunner/XmlTestRunListenerTest.java b/ddms/libs/ddmlib/src/test/java/com/android/ddmlib/testrunner/XmlTestRunListenerTest.java similarity index 100% rename from ddms/libs/ddmlib/tests/src/com/android/ddmlib/testrunner/XmlTestRunListenerTest.java rename to ddms/libs/ddmlib/src/test/java/com/android/ddmlib/testrunner/XmlTestRunListenerTest.java diff --git a/ddms/libs/ddmlib/tests/Android.mk b/ddms/libs/ddmlib/tests/Android.mk deleted file mode 100644 index 2ec4e19b8337e2b97400d212d7453275daaf3e0a..0000000000000000000000000000000000000000 --- a/ddms/libs/ddmlib/tests/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2010 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 := ddmlib-tests -LOCAL_MODULE_TAGS := optional - -LOCAL_JAVA_LIBRARIES := ddmlib junit easymock - -include $(BUILD_HOST_JAVA_LIBRARY) - -# Build all sub-directories -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/device_validator/dvlib/.classpath b/device_validator/dvlib/.classpath index 88fb9b4919a96750170ff7c285c67f61b196f8cc..ff35b91a8bcc11ccbaa491b6041eddcaf9de7e6d 100644 --- a/device_validator/dvlib/.classpath +++ b/device_validator/dvlib/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/device_validator/dvlib/Android.mk b/device_validator/dvlib/Android.mk index 1869adb972eb601f71aad9486b3ab6114cdc5409..aad91f60935150d7e3c7d96dc61c0b931e8601f0 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 0486fa60fbc8350883f8e169deb05f57d3ee86fe..df955ce4fc162083a7308fb2af59c239ee64fcb0 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 similarity index 100% rename from device_validator/dvlib/src/com/android/dvlib/DeviceSchema.java rename to 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 similarity index 100% rename from device_validator/dvlib/src/com/android/dvlib/devices.xsd rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/DeviceSchemaTest.java rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/devices.xml rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/devices_minimal.xml rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/devices_no_default.xml rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/devices_no_hardware.xml rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/devices_no_software.xml rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/devices_no_states.xml rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/devices_too_many_defaults.xml rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/extras/frame.jpeg rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/extras/frame.png rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/extras/sixteen.jpeg rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/extras/sixteen.png rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/extras/sixtyfour.jpeg rename to 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 similarity index 100% rename from device_validator/dvlib/tests/src/com/android/dvlib/extras/sixtyfour.png rename to 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 5094d7a8f317628b6f35836919d89e35f5e4e449..0000000000000000000000000000000000000000 --- 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)) diff --git a/layoutlib_api/.classpath b/layoutlib_api/.classpath index b4b5b9656b9d2cc0bc3bfd186331e896be377042..d7c9d12e4a9b9455d210600e40157717b99d79f9 100644 --- a/layoutlib_api/.classpath +++ b/layoutlib_api/.classpath @@ -1,7 +1,6 @@ - - + diff --git a/layoutlib_api/Android.mk b/layoutlib_api/Android.mk index 30ce41bb7c959d9dbb594ea4a2cbfffee529f2f4..32ee53fb6dc5d344a2fefa07a3254a3e902c6e4b 100644 --- a/layoutlib_api/Android.mk +++ b/layoutlib_api/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_JAVA_LIBRARIES := \ common \ @@ -25,3 +25,16 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_MODULE := layoutlib_api include $(BUILD_HOST_JAVA_LIBRARY) + +# build tests +include $(CLEAR_VARS) + +# Only compile source java files in this lib. +LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java) + +LOCAL_MODULE := layoutlib_api-tests +LOCAL_MODULE_TAGS := optional + +LOCAL_JAVA_LIBRARIES := layoutlib_api junit + +include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/layoutlib_api/build.gradle b/layoutlib_api/build.gradle index 82a2af4e49b4d1119b046edc976da02738d9522d..3f9247428f64dbbee7af94bdbdbec8545b35a3be 100644 --- a/layoutlib_api/build.gradle +++ b/layoutlib_api/build.gradle @@ -17,25 +17,6 @@ version = getVersion() group = 'com.android.tools.layoutlib' archivesBaseName = 'layoutlib-api' -sourceSets { - main { - java { - srcDir 'src' - } - resources { - srcDir 'src' - } - } - test { - java { - srcDir 'tests/src' - } - resources { - srcDir 'tests/src' - } - } -} - uploadArchives { repositories { mavenDeployer { diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/AdapterBinding.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/AdapterBinding.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/AdapterBinding.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/AdapterBinding.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/AttrResourceValue.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/AttrResourceValue.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/AttrResourceValue.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/AttrResourceValue.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/Bridge.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/Bridge.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/Bridge.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/Bridge.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/Capability.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/Capability.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/Capability.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/Capability.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/DataBindingItem.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/DataBindingItem.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/DataBindingItem.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/DataBindingItem.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/DeclareStyleableResourceValue.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/DeclareStyleableResourceValue.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/DeclareStyleableResourceValue.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/DeclareStyleableResourceValue.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/DensityBasedResourceValue.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/DensityBasedResourceValue.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/DensityBasedResourceValue.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/DensityBasedResourceValue.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/DrawableParams.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/DrawableParams.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/DrawableParams.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/DrawableParams.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/HardwareConfig.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/HardwareConfig.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/HardwareConfig.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/HardwareConfig.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/IAnimationListener.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/IAnimationListener.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/IAnimationListener.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/IAnimationListener.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/IImageFactory.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/IImageFactory.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/IImageFactory.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/IImageFactory.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/ILayoutPullParser.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/ILayoutPullParser.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/ILayoutPullParser.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/ILayoutPullParser.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/IProjectCallback.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/IProjectCallback.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/IProjectCallback.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/IProjectCallback.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/LayoutLog.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/LayoutLog.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/LayoutLog.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/LayoutLog.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/MergeCookie.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/MergeCookie.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/MergeCookie.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/MergeCookie.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/RenderParams.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/RenderParams.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/RenderParams.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/RenderParams.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/RenderResources.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/RenderResources.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/RenderResources.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/RenderResources.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/RenderSession.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/RenderSession.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/RenderSession.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/RenderSession.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/ResourceReference.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/ResourceReference.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/ResourceReference.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/ResourceReference.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/ResourceValue.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/ResourceValue.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/ResourceValue.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/ResourceValue.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/Result.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/Result.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/Result.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/Result.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/SessionParams.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/SessionParams.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/SessionParams.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/SessionParams.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/StyleResourceValue.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/StyleResourceValue.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/StyleResourceValue.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/StyleResourceValue.java diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/ViewInfo.java b/layoutlib_api/src/main/java/com/android/ide/common/rendering/api/ViewInfo.java similarity index 100% rename from layoutlib_api/src/com/android/ide/common/rendering/api/ViewInfo.java rename to layoutlib_api/src/main/java/com/android/ide/common/rendering/api/ViewInfo.java diff --git a/layoutlib_api/src/com/android/layoutlib/api/IDensityBasedResourceValue.java b/layoutlib_api/src/main/java/com/android/layoutlib/api/IDensityBasedResourceValue.java similarity index 100% rename from layoutlib_api/src/com/android/layoutlib/api/IDensityBasedResourceValue.java rename to layoutlib_api/src/main/java/com/android/layoutlib/api/IDensityBasedResourceValue.java diff --git a/layoutlib_api/src/com/android/layoutlib/api/ILayoutBridge.java b/layoutlib_api/src/main/java/com/android/layoutlib/api/ILayoutBridge.java similarity index 100% rename from layoutlib_api/src/com/android/layoutlib/api/ILayoutBridge.java rename to layoutlib_api/src/main/java/com/android/layoutlib/api/ILayoutBridge.java diff --git a/layoutlib_api/src/com/android/layoutlib/api/ILayoutLog.java b/layoutlib_api/src/main/java/com/android/layoutlib/api/ILayoutLog.java similarity index 100% rename from layoutlib_api/src/com/android/layoutlib/api/ILayoutLog.java rename to layoutlib_api/src/main/java/com/android/layoutlib/api/ILayoutLog.java diff --git a/layoutlib_api/src/com/android/layoutlib/api/ILayoutResult.java b/layoutlib_api/src/main/java/com/android/layoutlib/api/ILayoutResult.java similarity index 100% rename from layoutlib_api/src/com/android/layoutlib/api/ILayoutResult.java rename to layoutlib_api/src/main/java/com/android/layoutlib/api/ILayoutResult.java diff --git a/layoutlib_api/src/com/android/layoutlib/api/IProjectCallback.java b/layoutlib_api/src/main/java/com/android/layoutlib/api/IProjectCallback.java similarity index 100% rename from layoutlib_api/src/com/android/layoutlib/api/IProjectCallback.java rename to layoutlib_api/src/main/java/com/android/layoutlib/api/IProjectCallback.java diff --git a/layoutlib_api/src/com/android/layoutlib/api/IResourceValue.java b/layoutlib_api/src/main/java/com/android/layoutlib/api/IResourceValue.java similarity index 100% rename from layoutlib_api/src/com/android/layoutlib/api/IResourceValue.java rename to layoutlib_api/src/main/java/com/android/layoutlib/api/IResourceValue.java diff --git a/layoutlib_api/src/com/android/layoutlib/api/IStyleResourceValue.java b/layoutlib_api/src/main/java/com/android/layoutlib/api/IStyleResourceValue.java similarity index 100% rename from layoutlib_api/src/com/android/layoutlib/api/IStyleResourceValue.java rename to layoutlib_api/src/main/java/com/android/layoutlib/api/IStyleResourceValue.java diff --git a/layoutlib_api/src/com/android/layoutlib/api/IXmlPullParser.java b/layoutlib_api/src/main/java/com/android/layoutlib/api/IXmlPullParser.java similarity index 100% rename from layoutlib_api/src/com/android/layoutlib/api/IXmlPullParser.java rename to layoutlib_api/src/main/java/com/android/layoutlib/api/IXmlPullParser.java diff --git a/layoutlib_api/src/com/android/resources/Density.java b/layoutlib_api/src/main/java/com/android/resources/Density.java similarity index 100% rename from layoutlib_api/src/com/android/resources/Density.java rename to layoutlib_api/src/main/java/com/android/resources/Density.java diff --git a/layoutlib_api/src/com/android/resources/FolderTypeRelationship.java b/layoutlib_api/src/main/java/com/android/resources/FolderTypeRelationship.java similarity index 100% rename from layoutlib_api/src/com/android/resources/FolderTypeRelationship.java rename to layoutlib_api/src/main/java/com/android/resources/FolderTypeRelationship.java diff --git a/layoutlib_api/src/com/android/resources/Keyboard.java b/layoutlib_api/src/main/java/com/android/resources/Keyboard.java similarity index 100% rename from layoutlib_api/src/com/android/resources/Keyboard.java rename to layoutlib_api/src/main/java/com/android/resources/Keyboard.java diff --git a/layoutlib_api/src/com/android/resources/KeyboardState.java b/layoutlib_api/src/main/java/com/android/resources/KeyboardState.java similarity index 100% rename from layoutlib_api/src/com/android/resources/KeyboardState.java rename to layoutlib_api/src/main/java/com/android/resources/KeyboardState.java diff --git a/layoutlib_api/src/com/android/resources/LayoutDirection.java b/layoutlib_api/src/main/java/com/android/resources/LayoutDirection.java similarity index 100% rename from layoutlib_api/src/com/android/resources/LayoutDirection.java rename to layoutlib_api/src/main/java/com/android/resources/LayoutDirection.java diff --git a/layoutlib_api/src/com/android/resources/Navigation.java b/layoutlib_api/src/main/java/com/android/resources/Navigation.java similarity index 100% rename from layoutlib_api/src/com/android/resources/Navigation.java rename to layoutlib_api/src/main/java/com/android/resources/Navigation.java diff --git a/layoutlib_api/src/com/android/resources/NavigationState.java b/layoutlib_api/src/main/java/com/android/resources/NavigationState.java similarity index 100% rename from layoutlib_api/src/com/android/resources/NavigationState.java rename to layoutlib_api/src/main/java/com/android/resources/NavigationState.java diff --git a/layoutlib_api/src/com/android/resources/NightMode.java b/layoutlib_api/src/main/java/com/android/resources/NightMode.java similarity index 100% rename from layoutlib_api/src/com/android/resources/NightMode.java rename to layoutlib_api/src/main/java/com/android/resources/NightMode.java diff --git a/layoutlib_api/src/com/android/resources/ResourceConstants.java b/layoutlib_api/src/main/java/com/android/resources/ResourceConstants.java similarity index 100% rename from layoutlib_api/src/com/android/resources/ResourceConstants.java rename to layoutlib_api/src/main/java/com/android/resources/ResourceConstants.java diff --git a/layoutlib_api/src/com/android/resources/ResourceEnum.java b/layoutlib_api/src/main/java/com/android/resources/ResourceEnum.java similarity index 100% rename from layoutlib_api/src/com/android/resources/ResourceEnum.java rename to layoutlib_api/src/main/java/com/android/resources/ResourceEnum.java diff --git a/layoutlib_api/src/com/android/resources/ResourceFolderType.java b/layoutlib_api/src/main/java/com/android/resources/ResourceFolderType.java similarity index 100% rename from layoutlib_api/src/com/android/resources/ResourceFolderType.java rename to layoutlib_api/src/main/java/com/android/resources/ResourceFolderType.java diff --git a/layoutlib_api/src/com/android/resources/ResourceType.java b/layoutlib_api/src/main/java/com/android/resources/ResourceType.java similarity index 100% rename from layoutlib_api/src/com/android/resources/ResourceType.java rename to layoutlib_api/src/main/java/com/android/resources/ResourceType.java diff --git a/layoutlib_api/src/com/android/resources/ScreenOrientation.java b/layoutlib_api/src/main/java/com/android/resources/ScreenOrientation.java similarity index 100% rename from layoutlib_api/src/com/android/resources/ScreenOrientation.java rename to layoutlib_api/src/main/java/com/android/resources/ScreenOrientation.java diff --git a/layoutlib_api/src/com/android/resources/ScreenRatio.java b/layoutlib_api/src/main/java/com/android/resources/ScreenRatio.java similarity index 100% rename from layoutlib_api/src/com/android/resources/ScreenRatio.java rename to layoutlib_api/src/main/java/com/android/resources/ScreenRatio.java diff --git a/layoutlib_api/src/com/android/resources/ScreenSize.java b/layoutlib_api/src/main/java/com/android/resources/ScreenSize.java similarity index 100% rename from layoutlib_api/src/com/android/resources/ScreenSize.java rename to layoutlib_api/src/main/java/com/android/resources/ScreenSize.java diff --git a/layoutlib_api/src/com/android/resources/TouchScreen.java b/layoutlib_api/src/main/java/com/android/resources/TouchScreen.java similarity index 100% rename from layoutlib_api/src/com/android/resources/TouchScreen.java rename to layoutlib_api/src/main/java/com/android/resources/TouchScreen.java diff --git a/layoutlib_api/src/com/android/resources/UiMode.java b/layoutlib_api/src/main/java/com/android/resources/UiMode.java similarity index 100% rename from layoutlib_api/src/com/android/resources/UiMode.java rename to layoutlib_api/src/main/java/com/android/resources/UiMode.java diff --git a/layoutlib_api/src/com/android/util/Pair.java b/layoutlib_api/src/main/java/com/android/util/Pair.java similarity index 100% rename from layoutlib_api/src/com/android/util/Pair.java rename to layoutlib_api/src/main/java/com/android/util/Pair.java diff --git a/common/tests/.classpath b/layoutlib_api/src/test/.classpath similarity index 92% rename from common/tests/.classpath rename to layoutlib_api/src/test/.classpath index cda19778dfb61287c5db20fe8febdab5ed702d35..7564f2f56e02b34141741d373d5ac4c3021114ab 100644 --- a/common/tests/.classpath +++ b/layoutlib_api/src/test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/layoutlib_api/tests/.project b/layoutlib_api/src/test/.project similarity index 100% rename from layoutlib_api/tests/.project rename to layoutlib_api/src/test/.project diff --git a/layoutlib_api/tests/src/com/android/resources/FolderTypeRelationShipTest.java b/layoutlib_api/src/test/java/com/android/resources/FolderTypeRelationShipTest.java similarity index 100% rename from layoutlib_api/tests/src/com/android/resources/FolderTypeRelationShipTest.java rename to layoutlib_api/src/test/java/com/android/resources/FolderTypeRelationShipTest.java diff --git a/layoutlib_api/tests/Android.mk b/layoutlib_api/tests/Android.mk deleted file mode 100644 index 10e75e88e158aa3320684661397b6869c0af55d2..0000000000000000000000000000000000000000 --- a/layoutlib_api/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) diff --git a/lint/.gitignore b/lint/.gitignore index 247246d169a94aedb91908d9fd9e625118f740a1..bc2e6ff4400cf72281a0d7f66c91753379bc3f49 100644 --- a/lint/.gitignore +++ b/lint/.gitignore @@ -4,4 +4,4 @@ libs/lint_api/bin libs/lint_api/build libs/lint_checks/bin libs/lint_checks/build -libs/lint_checks/tests/bin +libs/lint_checks/src/test/bin diff --git a/lint/cli/.classpath b/lint/cli/.classpath index d26b12abbd82f659ccb2173ed316ed0f16d55589..ade4f41a6de0cc9a1fa820efcc88ff3ea31d78ce 100644 --- a/lint/cli/.classpath +++ b/lint/cli/.classpath @@ -1,6 +1,6 @@ - + diff --git a/lint/cli/Android.mk b/lint/cli/Android.mk index f762d602ea70089f77b77524a74a69ad758a3976..5f7da91a2d292645523696f3f69df9310481bb2d 100644 --- a/lint/cli/Android.mk +++ b/lint/cli/Android.mk @@ -3,8 +3,8 @@ 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/java LOCAL_JAR_MANIFEST := etc/manifest.txt diff --git a/lint/cli/build.gradle b/lint/cli/build.gradle index 7cd02dc5777d14a80c81c6b3c54f78a458960783..d67ece1fd4fb7de9a1b879c1abe70bbb8b3a4ded 100644 --- a/lint/cli/build.gradle +++ b/lint/cli/build.gradle @@ -19,22 +19,8 @@ group = 'com.android.tools.lint' archivesBaseName = 'lint' sourceSets { - main { - java { - srcDir 'src' - } - resources { - srcDir 'src' - } - } - test { - java { - srcDir 'tests/src' - } - resources { - srcDir 'tests/src' - } - } + main.resources.srcDir 'src/main/java' + test.resources.srcDir 'src/test/java' } jar { diff --git a/lint/cli/src/com/android/tools/lint/HtmlReporter.java b/lint/cli/src/main/java/com/android/tools/lint/HtmlReporter.java similarity index 100% rename from lint/cli/src/com/android/tools/lint/HtmlReporter.java rename to lint/cli/src/main/java/com/android/tools/lint/HtmlReporter.java diff --git a/lint/cli/src/com/android/tools/lint/LintCliXmlParser.java b/lint/cli/src/main/java/com/android/tools/lint/LintCliXmlParser.java similarity index 100% rename from lint/cli/src/com/android/tools/lint/LintCliXmlParser.java rename to lint/cli/src/main/java/com/android/tools/lint/LintCliXmlParser.java diff --git a/lint/cli/src/com/android/tools/lint/LombokParser.java b/lint/cli/src/main/java/com/android/tools/lint/LombokParser.java similarity index 100% rename from lint/cli/src/com/android/tools/lint/LombokParser.java rename to lint/cli/src/main/java/com/android/tools/lint/LombokParser.java diff --git a/lint/cli/src/com/android/tools/lint/Main.java b/lint/cli/src/main/java/com/android/tools/lint/Main.java similarity index 100% rename from lint/cli/src/com/android/tools/lint/Main.java rename to lint/cli/src/main/java/com/android/tools/lint/Main.java diff --git a/lint/cli/src/com/android/tools/lint/MultiProjectHtmlReporter.java b/lint/cli/src/main/java/com/android/tools/lint/MultiProjectHtmlReporter.java similarity index 100% rename from lint/cli/src/com/android/tools/lint/MultiProjectHtmlReporter.java rename to lint/cli/src/main/java/com/android/tools/lint/MultiProjectHtmlReporter.java diff --git a/lint/cli/src/com/android/tools/lint/Reporter.java b/lint/cli/src/main/java/com/android/tools/lint/Reporter.java similarity index 100% rename from lint/cli/src/com/android/tools/lint/Reporter.java rename to lint/cli/src/main/java/com/android/tools/lint/Reporter.java diff --git a/lint/cli/src/com/android/tools/lint/TextReporter.java b/lint/cli/src/main/java/com/android/tools/lint/TextReporter.java similarity index 100% rename from lint/cli/src/com/android/tools/lint/TextReporter.java rename to lint/cli/src/main/java/com/android/tools/lint/TextReporter.java diff --git a/lint/cli/src/com/android/tools/lint/Warning.java b/lint/cli/src/main/java/com/android/tools/lint/Warning.java similarity index 100% rename from lint/cli/src/com/android/tools/lint/Warning.java rename to lint/cli/src/main/java/com/android/tools/lint/Warning.java diff --git a/lint/cli/src/com/android/tools/lint/XmlReporter.java b/lint/cli/src/main/java/com/android/tools/lint/XmlReporter.java similarity index 100% rename from lint/cli/src/com/android/tools/lint/XmlReporter.java rename to lint/cli/src/main/java/com/android/tools/lint/XmlReporter.java diff --git a/lint/cli/src/com/android/tools/lint/default.css b/lint/cli/src/main/java/com/android/tools/lint/default.css similarity index 100% rename from lint/cli/src/com/android/tools/lint/default.css rename to lint/cli/src/main/java/com/android/tools/lint/default.css diff --git a/lint/cli/src/com/android/tools/lint/hololike.css b/lint/cli/src/main/java/com/android/tools/lint/hololike.css similarity index 100% rename from lint/cli/src/com/android/tools/lint/hololike.css rename to lint/cli/src/main/java/com/android/tools/lint/hololike.css diff --git a/lint/cli/src/com/android/tools/lint/lint-error.png b/lint/cli/src/main/java/com/android/tools/lint/lint-error.png similarity index 100% rename from lint/cli/src/com/android/tools/lint/lint-error.png rename to lint/cli/src/main/java/com/android/tools/lint/lint-error.png diff --git a/lint/cli/src/com/android/tools/lint/lint-run.png b/lint/cli/src/main/java/com/android/tools/lint/lint-run.png similarity index 100% rename from lint/cli/src/com/android/tools/lint/lint-run.png rename to lint/cli/src/main/java/com/android/tools/lint/lint-run.png diff --git a/lint/cli/src/com/android/tools/lint/lint-warning.png b/lint/cli/src/main/java/com/android/tools/lint/lint-warning.png similarity index 100% rename from lint/cli/src/com/android/tools/lint/lint-warning.png rename to lint/cli/src/main/java/com/android/tools/lint/lint-warning.png diff --git a/lint/libs/lint_api/.classpath b/lint/libs/lint_api/.classpath index 0381385e63d086f65cb82a150323870333e6e50d..426f226a43ded2dff4c5d96a9f713e15623348ac 100644 --- a/lint/libs/lint_api/.classpath +++ b/lint/libs/lint_api/.classpath @@ -1,6 +1,6 @@ - + diff --git a/lint/libs/lint_api/Android.mk b/lint/libs/lint_api/Android.mk index 9e2e6788695aa4a906f5c1264949a64518877086..1d70a256ce332967be937289d1140662fdc603ed 100644 --- a/lint/libs/lint_api/Android.mk +++ b/lint/libs/lint_api/Android.mk @@ -17,8 +17,8 @@ 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_JAVA_RESOURCE_DIRS := src +LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) +LOCAL_JAVA_RESOURCE_DIRS := src/main/java LOCAL_JAVA_LIBRARIES := \ lombok-ast-0.2 \ common \ diff --git a/lint/libs/lint_api/build.gradle b/lint/libs/lint_api/build.gradle index 315c2bbff81675adb61620785a149171cf9ded86..fe4d084ec76972e200f96b90ff9e4c334d0b1859 100644 --- a/lint/libs/lint_api/build.gradle +++ b/lint/libs/lint_api/build.gradle @@ -22,14 +22,8 @@ group = 'com.android.tools.lint' archivesBaseName = 'lint-api' sourceSets { - main { - java { - srcDir 'src' - } - resources { - srcDir 'src' - } - } + main.resources.srcDir 'src/main/java' + test.resources.srcDir 'src/test/java' } uploadArchives { diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/AsmVisitor.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/AsmVisitor.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/client/api/AsmVisitor.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/AsmVisitor.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/Configuration.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/Configuration.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/client/api/Configuration.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/Configuration.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/DefaultConfiguration.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/DefaultConfiguration.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/client/api/DefaultConfiguration.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/DefaultConfiguration.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/DefaultSdkInfo.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/DefaultSdkInfo.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/client/api/DefaultSdkInfo.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/DefaultSdkInfo.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/IDomParser.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/IDomParser.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/client/api/IDomParser.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/IDomParser.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/IJavaParser.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/IJavaParser.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/client/api/IJavaParser.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/IJavaParser.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/IssueRegistry.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/IssueRegistry.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/client/api/IssueRegistry.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/IssueRegistry.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/JavaVisitor.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/JavaVisitor.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/client/api/JavaVisitor.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/JavaVisitor.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintClient.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/LintClient.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/client/api/LintClient.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/LintClient.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintDriver.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/LintDriver.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/client/api/LintDriver.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/LintDriver.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintListener.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/LintListener.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/client/api/LintListener.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/LintListener.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/SdkInfo.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/SdkInfo.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/client/api/SdkInfo.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/SdkInfo.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/XmlVisitor.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/XmlVisitor.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/client/api/XmlVisitor.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/client/api/XmlVisitor.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Category.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Category.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/Category.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Category.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/ClassContext.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/ClassContext.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/ClassContext.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/ClassContext.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Context.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Context.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/Context.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Context.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/DefaultPosition.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/DefaultPosition.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/DefaultPosition.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/DefaultPosition.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Detector.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Detector.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/Detector.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Detector.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Issue.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Issue.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/Issue.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Issue.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/JavaContext.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/JavaContext.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/JavaContext.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/JavaContext.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/LayoutDetector.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/LayoutDetector.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/LayoutDetector.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/LayoutDetector.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/LintUtils.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/LintUtils.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/LintUtils.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/LintUtils.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Location.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Location.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/Location.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Location.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Position.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Position.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/Position.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Position.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Project.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Project.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/Project.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Project.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/ResourceXmlDetector.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/ResourceXmlDetector.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/ResourceXmlDetector.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/ResourceXmlDetector.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Scope.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Scope.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/Scope.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Scope.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Severity.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Severity.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/Severity.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Severity.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Speed.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Speed.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/Speed.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Speed.java diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/XmlContext.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/XmlContext.java similarity index 100% rename from lint/libs/lint_api/src/com/android/tools/lint/detector/api/XmlContext.java rename to lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/XmlContext.java diff --git a/lint/libs/lint_checks/.classpath b/lint/libs/lint_checks/.classpath index a8ae948bf6123ebfbc104c6c70d6965715e7ac10..b169864df43cc2b83c416e5d1dcc70e00972ef35 100644 --- a/lint/libs/lint_checks/.classpath +++ b/lint/libs/lint_checks/.classpath @@ -1,6 +1,6 @@ - + diff --git a/lint/libs/lint_checks/Android.mk b/lint/libs/lint_checks/Android.mk index e15e9281515c7ba065eb561d7121c181bda91175..0ecb3d01b1ae1591269cefe964987768b42b1f5e 100644 --- a/lint/libs/lint_checks/Android.mk +++ b/lint/libs/lint_checks/Android.mk @@ -4,8 +4,8 @@ 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_JAVA_RESOURCE_DIRS := src +LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) +LOCAL_JAVA_RESOURCE_DIRS := src/main/java # If the dependency list is changed, etc/manifest.txt LOCAL_JAVA_LIBRARIES := \ @@ -24,5 +24,15 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_HOST_JAVA_LIBRARY) -# Build all sub-directories -include $(call all-makefiles-under,$(LOCAL_PATH)) +# Build tests +include $(CLEAR_VARS) + +# Only compile source java files in this lib. +LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java) + +LOCAL_MODULE := lint_checks-tests +LOCAL_MODULE_TAGS := optional + +LOCAL_JAVA_LIBRARIES := common sdklib lint_api lint_checks lint junit easymock asm-tools asm-tree-tools guava-tools layoutlib_api sdktestutils + +include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/lint/libs/lint_checks/build.gradle b/lint/libs/lint_checks/build.gradle index 32180423991d017e6640044218bd9f228764638e..9326045cb2ee06ca9740b16439d0cd0927de2306 100644 --- a/lint/libs/lint_checks/build.gradle +++ b/lint/libs/lint_checks/build.gradle @@ -21,22 +21,8 @@ group = 'com.android.tools.lint' archivesBaseName = 'lint-checks' sourceSets { - main { - java { - srcDir 'src' - } - resources { - srcDir 'src' - } - } - test { - java { - srcDir 'tests/src' - } - resources { - srcDir 'tests/src' - } - } + main.resources.srcDir 'src/main/java' + test.resources.srcDir 'src/test/java' } uploadArchives { diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/AccessibilityDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/AccessibilityDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/AccessibilityDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/AccessibilityDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/AlwaysShowActionDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/AlwaysShowActionDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/AlwaysShowActionDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/AlwaysShowActionDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/AnnotationDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/AnnotationDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/AnnotationDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/AnnotationDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/Api.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/Api.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/Api.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/Api.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiClass.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ApiClass.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiClass.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ApiClass.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ApiDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ApiDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiLookup.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ApiLookup.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiLookup.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ApiLookup.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiParser.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ApiParser.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiParser.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ApiParser.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ArraySizeDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ArraySizeDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ArraySizeDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ArraySizeDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/BuiltinIssueRegistry.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/BuiltinIssueRegistry.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/BuiltinIssueRegistry.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/BuiltinIssueRegistry.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ButtonDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ButtonDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ButtonDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ButtonDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ChildCountDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ChildCountDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ChildCountDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ChildCountDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ColorUsageDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ColorUsageDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ColorUsageDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ColorUsageDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/CommentDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/CommentDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/CommentDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/CommentDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ControlFlowGraph.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ControlFlowGraph.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ControlFlowGraph.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ControlFlowGraph.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/CutPasteDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/CutPasteDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/CutPasteDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/CutPasteDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/DeprecationDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/DeprecationDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/DeprecationDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/DeprecationDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/DetectMissingPrefix.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/DetectMissingPrefix.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/DetectMissingPrefix.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/DetectMissingPrefix.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/DosLineEndingDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/DosLineEndingDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/DosLineEndingDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/DosLineEndingDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/DuplicateIdDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/DuplicateIdDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/DuplicateIdDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/DuplicateIdDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/DuplicateResourceDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/DuplicateResourceDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/DuplicateResourceDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/DuplicateResourceDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ExtraTextDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ExtraTextDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ExtraTextDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ExtraTextDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/FieldGetterDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/FieldGetterDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/FieldGetterDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/FieldGetterDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/FragmentDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/FragmentDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/FragmentDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/FragmentDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/GridLayoutDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/GridLayoutDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/GridLayoutDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/GridLayoutDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/HandlerDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/HandlerDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/HandlerDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/HandlerDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/HardcodedDebugModeDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/HardcodedDebugModeDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/HardcodedDebugModeDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/HardcodedDebugModeDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/HardcodedValuesDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/HardcodedValuesDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/HardcodedValuesDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/HardcodedValuesDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/IconDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/IconDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/IconDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/IconDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/InefficientWeightDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/InefficientWeightDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/InefficientWeightDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/InefficientWeightDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/InvalidPackageDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/InvalidPackageDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/InvalidPackageDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/InvalidPackageDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/JavaPerformanceDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/JavaPerformanceDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/JavaPerformanceDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/JavaPerformanceDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/LabelForDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/LabelForDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/LabelForDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/LabelForDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/LocaleDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/LocaleDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/LocaleDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/LocaleDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ManifestOrderDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ManifestOrderDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ManifestOrderDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ManifestOrderDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/MathDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/MathDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/MathDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/MathDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/MergeRootFrameLayoutDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/MergeRootFrameLayoutDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/MergeRootFrameLayoutDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/MergeRootFrameLayoutDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/MissingClassDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/MissingClassDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/MissingClassDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/MissingClassDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/MissingIdDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/MissingIdDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/MissingIdDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/MissingIdDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/NamespaceDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/NamespaceDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/NamespaceDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/NamespaceDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/NestedScrollingWidgetDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/NestedScrollingWidgetDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/NestedScrollingWidgetDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/NestedScrollingWidgetDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/NonInternationalizedSmsDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/NonInternationalizedSmsDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/NonInternationalizedSmsDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/NonInternationalizedSmsDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ObsoleteLayoutParamsDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ObsoleteLayoutParamsDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ObsoleteLayoutParamsDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ObsoleteLayoutParamsDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/OnClickDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/OnClickDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/OnClickDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/OnClickDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/OverdrawDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/OverdrawDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/OverdrawDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/OverdrawDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/OverrideDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/OverrideDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/OverrideDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/OverrideDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/PrivateKeyDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/PrivateKeyDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/PrivateKeyDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/PrivateKeyDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/PrivateResourceDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/PrivateResourceDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/PrivateResourceDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/PrivateResourceDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ProguardDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ProguardDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ProguardDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ProguardDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/PxUsageDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/PxUsageDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/PxUsageDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/PxUsageDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/RegistrationDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/RegistrationDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/RegistrationDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/RegistrationDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/RequiredAttributeDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/RequiredAttributeDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/RequiredAttributeDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/RequiredAttributeDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ScrollViewChildDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ScrollViewChildDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ScrollViewChildDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ScrollViewChildDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/SdCardDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/SdCardDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/SdCardDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/SdCardDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/SecureRandomDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/SecureRandomDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/SecureRandomDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/SecureRandomDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/SecurityDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/SecurityDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/SecurityDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/SecurityDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/SetJavaScriptEnabledDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/SetJavaScriptEnabledDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/SetJavaScriptEnabledDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/SetJavaScriptEnabledDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/SharedPrefsDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/SharedPrefsDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/SharedPrefsDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/SharedPrefsDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/StateListDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/StateListDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/StateListDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/StateListDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/StringFormatDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/StringFormatDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/StringFormatDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/StringFormatDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/StyleCycleDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/StyleCycleDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/StyleCycleDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/StyleCycleDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/SystemPermissionsDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/SystemPermissionsDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/SystemPermissionsDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/SystemPermissionsDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TextFieldDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TextFieldDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/TextFieldDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TextFieldDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TextViewDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TextViewDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/TextViewDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TextViewDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TitleDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TitleDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/TitleDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TitleDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ToastDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ToastDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ToastDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ToastDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TooManyViewsDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TooManyViewsDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/TooManyViewsDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TooManyViewsDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TranslationDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TranslationDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypoDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TypoDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/TypoDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TypoDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypoLookup.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TypoLookup.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/TypoLookup.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TypoLookup.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypographyDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TypographyDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/TypographyDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/TypographyDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/UnusedResourceDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/UnusedResourceDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/UnusedResourceDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/UnusedResourceDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/UseCompoundDrawableDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/UseCompoundDrawableDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/UseCompoundDrawableDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/UseCompoundDrawableDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/UselessViewDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/UselessViewDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/UselessViewDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/UselessViewDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/Utf8Detector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/Utf8Detector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/Utf8Detector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/Utf8Detector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewConstructorDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ViewConstructorDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewConstructorDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ViewConstructorDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewTagDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ViewTagDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewTagDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ViewTagDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewTypeDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ViewTypeDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewTypeDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ViewTypeDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WakelockDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/WakelockDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/WakelockDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/WakelockDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongIdDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/WrongIdDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongIdDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/WrongIdDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongImportDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/WrongImportDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongImportDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/WrongImportDetector.java diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongLocationDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/WrongLocationDetector.java similarity index 100% rename from lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongLocationDetector.java rename to lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/WrongLocationDetector.java diff --git a/lint/libs/lint_checks/tests/.classpath b/lint/libs/lint_checks/src/test/.classpath similarity index 97% rename from lint/libs/lint_checks/tests/.classpath rename to lint/libs/lint_checks/src/test/.classpath index 24bb642a38b52b372dc414f4d30416d841cc7b1e..178cd8c0e8a2b168df0ec85a0a39ea86a5ea5c69 100644 --- a/lint/libs/lint_checks/tests/.classpath +++ b/lint/libs/lint_checks/src/test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/lint/libs/lint_checks/tests/.project b/lint/libs/lint_checks/src/test/.project similarity index 100% rename from lint/libs/lint_checks/tests/.project rename to lint/libs/lint_checks/src/test/.project diff --git a/lint/libs/lint_checks/src/test/.settings/org.eclipse.core.resources.prefs b/lint/libs/lint_checks/src/test/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000000000000000000000000000000000..609db5710f0370e736771742b68085778f5e5cb1 --- /dev/null +++ b/lint/libs/lint_checks/src/test/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +encoding//java/com/android/tools/lint/checks/TypoDetectorTest.java=UTF-8 +encoding//java/com/android/tools/lint/checks/TypoLookupTest.java=UTF-8 +encoding//java/com/android/tools/lint/checks/TypographyDetectorTest.java=UTF-8 +encoding//java/com/android/tools/lint/checks/data/res/values-nb/typos.xml=UTF-8 diff --git a/lint/libs/lint_checks/tests/.settings/org.moreunit.prefs b/lint/libs/lint_checks/src/test/.settings/org.moreunit.prefs similarity index 100% rename from lint/libs/lint_checks/tests/.settings/org.moreunit.prefs rename to lint/libs/lint_checks/src/test/.settings/org.moreunit.prefs diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/LintCliXmlParserTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/LintCliXmlParserTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/LintCliXmlParserTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/LintCliXmlParserTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/MainTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/MainTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/MainTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/MainTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/XmlReporterTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/XmlReporterTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/XmlReporterTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/XmlReporterTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/AbstractCheckTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AbstractCheckTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/AbstractCheckTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AbstractCheckTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/AccessibilityDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AccessibilityDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/AccessibilityDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AccessibilityDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/AlwaysShowActionDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AlwaysShowActionDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/AlwaysShowActionDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AlwaysShowActionDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/AnnotationDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AnnotationDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/AnnotationDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AnnotationDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ApiDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ApiDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ApiDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ApiDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ApiLookupTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ApiLookupTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ApiLookupTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ApiLookupTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ArraySizeDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ArraySizeDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ArraySizeDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ArraySizeDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ButtonDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ButtonDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ButtonDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ButtonDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ChildCountDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ChildCountDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ChildCountDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ChildCountDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ColorUsageDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ColorUsageDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ColorUsageDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ColorUsageDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/CommentDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/CommentDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/CommentDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/CommentDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/CutPasteDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/CutPasteDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/CutPasteDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/CutPasteDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/DeprecationDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DeprecationDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/DeprecationDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DeprecationDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/DetectMissingPrefixTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DetectMissingPrefixTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/DetectMissingPrefixTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DetectMissingPrefixTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/DosLineEndingDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DosLineEndingDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/DosLineEndingDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DosLineEndingDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/DuplicateIdDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DuplicateIdDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/DuplicateIdDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DuplicateIdDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/DuplicateResourceDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DuplicateResourceDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/DuplicateResourceDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DuplicateResourceDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ExtraTextDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ExtraTextDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ExtraTextDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ExtraTextDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/FieldGetterDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/FieldGetterDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/FieldGetterDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/FieldGetterDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/FragmentDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/FragmentDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/FragmentDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/FragmentDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/GridLayoutDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/GridLayoutDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/GridLayoutDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/GridLayoutDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/HandlerDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/HandlerDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/HandlerDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/HandlerDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/HardcodedDebugModeDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/HardcodedDebugModeDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/HardcodedDebugModeDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/HardcodedDebugModeDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/HardcodedValuesDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/HardcodedValuesDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/HardcodedValuesDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/HardcodedValuesDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/IconDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/IconDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/IconDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/IconDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/InefficientWeightDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/InefficientWeightDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/InefficientWeightDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/InefficientWeightDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/InvalidPackageDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/InvalidPackageDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/InvalidPackageDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/InvalidPackageDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/JavaPerformanceDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/JavaPerformanceDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/JavaPerformanceDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/JavaPerformanceDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/LabelForDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/LabelForDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/LabelForDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/LabelForDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/LocaleDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/LocaleDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/LocaleDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/LocaleDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ManifestOrderDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ManifestOrderDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ManifestOrderDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ManifestOrderDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/MathDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MathDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/MathDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MathDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/MergeRootFrameLayoutDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MergeRootFrameLayoutDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/MergeRootFrameLayoutDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MergeRootFrameLayoutDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/MissingClassDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MissingClassDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/MissingClassDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MissingClassDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/MissingIdDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MissingIdDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/MissingIdDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MissingIdDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/NamespaceDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/NamespaceDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/NamespaceDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/NamespaceDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/NestedScrollingWidgetDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/NestedScrollingWidgetDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/NestedScrollingWidgetDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/NestedScrollingWidgetDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/NonInternationalizedSmsDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/NonInternationalizedSmsDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/NonInternationalizedSmsDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/NonInternationalizedSmsDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ObsoleteLayoutParamsDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ObsoleteLayoutParamsDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ObsoleteLayoutParamsDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ObsoleteLayoutParamsDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/OnClickDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/OnClickDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/OnClickDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/OnClickDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/OverdrawDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/OverdrawDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/OverdrawDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/OverdrawDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/OverrideDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/OverrideDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/OverrideDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/OverrideDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/PrivateKeyDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/PrivateKeyDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/PrivateKeyDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/PrivateKeyDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/PrivateResourceDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/PrivateResourceDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/PrivateResourceDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/PrivateResourceDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ProguardDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ProguardDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ProguardDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ProguardDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/PxUsageDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/PxUsageDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/PxUsageDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/PxUsageDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/RegistrationDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/RegistrationDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/RegistrationDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/RegistrationDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/RequiredAttributeDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/RequiredAttributeDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/RequiredAttributeDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/RequiredAttributeDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ScrollViewChildDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ScrollViewChildDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ScrollViewChildDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ScrollViewChildDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/SdCardDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SdCardDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/SdCardDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SdCardDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/SecureRandomDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SecureRandomDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/SecureRandomDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SecureRandomDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/SecurityDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SecurityDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/SecurityDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SecurityDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/SetJavaScriptEnabledDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SetJavaScriptEnabledDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/SetJavaScriptEnabledDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SetJavaScriptEnabledDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/SharedPrefsDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SharedPrefsDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/SharedPrefsDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SharedPrefsDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/StateListDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/StateListDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/StateListDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/StateListDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/StringFormatDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/StringFormatDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/StringFormatDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/StringFormatDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/StyleCycleDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/StyleCycleDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/StyleCycleDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/StyleCycleDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/SystemPermissionsDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SystemPermissionsDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/SystemPermissionsDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SystemPermissionsDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TextFieldDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TextFieldDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TextFieldDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TextFieldDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TextViewDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TextViewDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TextViewDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TextViewDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TitleDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TitleDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TitleDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TitleDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ToastDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ToastDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ToastDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ToastDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TooManyViewsDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TooManyViewsDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TooManyViewsDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TooManyViewsDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TranslationDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TranslationDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TranslationDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TranslationDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TypoDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TypoDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TypoDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TypoDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TypoLookupTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TypoLookupTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TypoLookupTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TypoLookupTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TypographyDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TypographyDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/TypographyDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TypographyDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/UnusedResourceDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/UnusedResourceDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/UnusedResourceDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/UnusedResourceDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/UseCompoundDrawableDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/UseCompoundDrawableDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/UseCompoundDrawableDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/UseCompoundDrawableDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/UselessViewDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/UselessViewDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/UselessViewDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/UselessViewDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/Utf8DetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/Utf8DetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/Utf8DetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/Utf8DetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ViewConstructorDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ViewConstructorDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ViewConstructorDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ViewConstructorDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ViewTagDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ViewTagDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ViewTagDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ViewTagDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ViewTypeDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ViewTypeDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/ViewTypeDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ViewTypeDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/WakelockDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WakelockDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/WakelockDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WakelockDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/WrongIdDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WrongIdDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/WrongIdDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WrongIdDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/WrongImportDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WrongImportDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/WrongImportDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WrongImportDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/WrongLocationDetectorTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WrongLocationDetectorTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/WrongLocationDetectorTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WrongLocationDetectorTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/AbstractActivity.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/AbstractActivity.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/AbstractActivity.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/AbstractActivity.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/AndroidManifest.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/AndroidManifest.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/AndroidManifest.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/AndroidManifest.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/allowbackup.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/allowbackup.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/allowbackup.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/allowbackup.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/allowbackup_ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/allowbackup_ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/allowbackup_ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/allowbackup_ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyActivity.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyActivity.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyActivity.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyActivity.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyLinear.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyLinear.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyLinear.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyLinear.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$1.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$1.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$1.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$1.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1$InnerInnerClass1.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1$InnerInnerClass1.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1$InnerInnerClass1.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1$InnerInnerClass1.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass2.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass2.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass2.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass2.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest$LocalClass.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest$LocalClass.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest$LocalClass.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest$LocalClass.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$1.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$1.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$1.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$1.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$2.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$2.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$2.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$2.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/CloseTest.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/CloseTest.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/CloseTest.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/CloseTest.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/CloseTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/CloseTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/CloseTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/CloseTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/Intermediate$IntermediateCustomV.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate$IntermediateCustomV.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/Intermediate$IntermediateCustomV.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate$IntermediateCustomV.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/Intermediate.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/Intermediate.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/Intermediate.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/Intermediate.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest1.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest1.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest1.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest1.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest1.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest1.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest1.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest1.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest2.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest2.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest2.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest2.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest2.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest2.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest2.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest2.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest3.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest3.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest3.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest3.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest3.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest3.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest3.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest3.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest4.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest4.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest4.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest4.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest4.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest4.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/SuppressTest4.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest4.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/TestEnum.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/TestEnum.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/TestEnum.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/TestEnum.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/TestEnum.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/TestEnum.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/TestEnum.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/TestEnum.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/TestLint.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/TestLint.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/TestLint.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/TestLint.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/classpath b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/classpath similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/classpath rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/classpath diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/colors.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/colors.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/colors.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/colors.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/holomanifest.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/holomanifest.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/holomanifest.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/holomanifest.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/layout.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/layout.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/layout.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/layout.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/layout_targetapi.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/layout_targetapi.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/layout_targetapi.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/layout_targetapi.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/minsdk1.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk1.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/minsdk1.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk1.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/minsdk10.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk10.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/minsdk10.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk10.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/minsdk14.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk14.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/minsdk14.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk14.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/minsdk17.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk17.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/minsdk17.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk17.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/minsdk2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/minsdk2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/minsdk4.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk4.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/minsdk4.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk4.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/themes.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/themes.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/themes.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/themes.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/unsupported.jar.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/unsupported.jar.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/unsupported.jar.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/unsupported.jar.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/view.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/view.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/apicheck/view.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/view.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/broken-manifest.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/broken-manifest.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/broken-manifest.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/broken-manifest.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/broken-manifest2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/broken-manifest2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/broken-manifest2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/broken-manifest2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/.classpath b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/.classpath similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/.classpath rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/.classpath diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/AbstractActivity.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AbstractActivity.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/AbstractActivity.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AbstractActivity.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/AbstractActivity.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AbstractActivity.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/AbstractActivity.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AbstractActivity.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/AndroidManifest.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifest.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/AndroidManifest.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifest.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/AndroidManifestReg.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifestReg.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/AndroidManifestReg.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifestReg.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/AndroidManifestWrongRegs.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifestWrongRegs.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/AndroidManifestWrongRegs.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifestWrongRegs.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/Class1$Class4.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class1$Class4.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/Class1$Class4.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class1$Class4.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/Class1.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class1.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/Class1.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class1.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/Class2$Class3.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class2$Class3.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/Class2$Class3.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class2$Class3.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/Class2.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class2.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/Class2.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class2.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CommentsActivity.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CommentsActivity.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CommentsActivity.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CommentsActivity.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CommentsActivity.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CommentsActivity.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CommentsActivity.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CommentsActivity.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomView1.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView1.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomView1.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView1.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomView1.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView1.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomView1.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView1.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomView2.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView2.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomView2.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView2.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomView2.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView2.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomView2.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView2.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomView3.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView3.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomView3.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView3.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomView3.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView3.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomView3.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView3.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomViewTest.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomViewTest.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/CustomViewTest.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomViewTest.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment1.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment1.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment1.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment1.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment2.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment2.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment2.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment2.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment3.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment3.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment3.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment3.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment4.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment4.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment4.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment4.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment5.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment5.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment5.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment5.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment6.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment6.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment6.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment6.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$NotAFragment.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$NotAFragment.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$NotAFragment.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$NotAFragment.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$ValidFragment1.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$ValidFragment1.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest$ValidFragment1.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$ValidFragment1.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/FragmentTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/GetterTest.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/GetterTest.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/GetterTest.jar.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.jar.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/GetterTest.jar.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.jar.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/GetterTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/GetterTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/HandlerTest$1.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$1.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/HandlerTest$1.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$1.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/HandlerTest$Inner.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$Inner.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/HandlerTest$Inner.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$Inner.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/HandlerTest$StaticInner.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$StaticInner.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/HandlerTest$StaticInner.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$StaticInner.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/HandlerTest.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/HandlerTest.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/HandlerTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/HandlerTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/LocaleTest.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/LocaleTest.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/LocaleTest.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/LocaleTest.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/LocaleTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/LocaleTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/LocaleTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/LocaleTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/MathTest.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/MathTest.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/MathTest.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/MathTest.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/MathTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/MathTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/MathTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/MathTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/OnClickActivity.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/OnClickActivity.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/OnClickActivity.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/OnClickActivity.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/OnClickActivity.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/OnClickActivity.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/OnClickActivity.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/OnClickActivity.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestProvider.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestProvider.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestProvider.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestProvider.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestProvider2.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider2.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestProvider2.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider2.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestProvider2.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider2.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestProvider2.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider2.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestReceiver$1.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver$1.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestReceiver$1.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver$1.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestReceiver.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestReceiver.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestReceiver.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestReceiver.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestService.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestService.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestService.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestService.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestService.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestService.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/TestService.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestService.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/ViewTagTest.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/ViewTagTest.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/ViewTagTest.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/ViewTagTest.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/ViewTagTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/ViewTagTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/ViewTagTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/ViewTagTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/classes.jar b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/classes.jar similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/classes.jar rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/classes.jar diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/classpath-jar b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/classpath-jar similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/classpath-jar rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/classpath-jar diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/classpath-lib b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/classpath-lib similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/bytecode/classpath-lib rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/classpath-lib diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/debuggable.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/debuggable.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/debuggable.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/debuggable.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/duplicate-manifest-ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate-manifest-ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/duplicate-manifest-ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate-manifest-ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/duplicate-manifest.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate-manifest.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/duplicate-manifest.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate-manifest.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/duplicate_permissions1.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions1.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/duplicate_permissions1.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions1.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/duplicate_permissions2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/duplicate_permissions2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/duplicate_permissions3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/duplicate_permissions3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportactivity0.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity0.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportactivity0.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity0.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportactivity1.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity1.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportactivity1.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity1.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportactivity2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportactivity2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportactivity3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportactivity3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportactivity4.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity4.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportactivity4.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity4.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportprovider1.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportprovider1.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportprovider1.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportprovider1.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportprovider2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportprovider2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportprovider2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportprovider2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver0.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver0.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver0.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver0.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver1.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver1.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver1.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver1.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver4.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver4.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver4.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver4.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver5.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver5.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver5.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver5.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver6.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver6.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportreceiver6.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver6.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportservice1.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice1.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportservice1.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice1.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportservice2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportservice2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportservice3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportservice3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportservice4.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice4.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportservice4.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice4.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportservice5.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice5.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/exportservice5.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice5.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/gen/my/pkg/R.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/gen/my/pkg/R.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/gen/my/pkg/R.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/gen/my/pkg/R.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/gen/my/pkg/R2.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/gen/my/pkg/R2.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/gen/my/pkg/R2.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/gen/my/pkg/R2.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/grantpermission.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/grantpermission.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/grantpermission.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/grantpermission.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/ignoremissing.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/ignoremissing.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/ignoremissing.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/ignoremissing.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/minsdk5targetsdk14.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/minsdk5targetsdk14.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/minsdk5targetsdk14.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/minsdk5targetsdk14.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/minsdk5targetsdk9.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/minsdk5targetsdk9.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/minsdk5targetsdk9.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/minsdk5targetsdk9.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/missingmin.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingmin.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/missingmin.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingmin.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/missingprefix.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingprefix.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/missingprefix.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingprefix.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/missingtarget.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingtarget.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/missingtarget.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingtarget.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/missingusessdk.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingusessdk.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/missingusessdk.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingusessdk.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiplesdk.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiplesdk.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiplesdk.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiplesdk.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/LibraryCode.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/LibraryCode.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/LibraryCode.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/LibraryCode.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/MainCode.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/MainCode.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/MainCode.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/MainCode.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/library-manifest.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/library-manifest.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/library-manifest.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/library-manifest.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/library.properties b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/library.properties similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/library.properties rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/library.properties diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/main-manifest.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/main-manifest.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/main-manifest.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/main-manifest.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/main-merge.properties b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/main-merge.properties similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/main-merge.properties rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/main-merge.properties diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/main.properties b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/main.properties similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/main.properties rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/main.properties diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/strings.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/strings.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/multiproject/strings.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/strings.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/oldtarget.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/oldtarget.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/oldtarget.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/oldtarget.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/.classpath b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/.classpath similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/.classpath rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/.classpath diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/.project b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/.project similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/.project rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/.project diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/AndroidManifest.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/AndroidManifest.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/AndroidManifest.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/AndroidManifest.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/BuildConfig.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/BuildConfig.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/BuildConfig.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/BuildConfig.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/R.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/R.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/R.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/R.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/project.properties b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/project.properties similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/project.properties rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/project.properties diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/drawable-hdpi/ic_launcher.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/drawable-hdpi/ic_launcher.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-hdpi/ic_launcher.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/drawable-ldpi/ic_launcher.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/drawable-ldpi/ic_launcher.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-ldpi/ic_launcher.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/drawable-mdpi/ic_launcher.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/drawable-mdpi/ic_launcher.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-mdpi/ic_launcher.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/fifth.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/fifth.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/fifth.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/fifth.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/fourth.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/fourth.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/fourth.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/fourth.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/main.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/main.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/main.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/main.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/main_ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/main_ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/main_ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/main_ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/second.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/second.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/second.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/second.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/sixth.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/sixth.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/sixth.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/sixth.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/third.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/third.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/layout/third.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/third.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/values/strings.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/values/strings.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/values/strings.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/values/strings.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/values/styles.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/values/styles.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/res/values/styles.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/values/styles.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/src/test/pkg/FourthActivity.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/FourthActivity.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/src/test/pkg/FourthActivity.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/FourthActivity.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/src/test/pkg/OverdrawActivity.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/OverdrawActivity.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/src/test/pkg/OverdrawActivity.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/OverdrawActivity.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/src/test/pkg/SecondActivity.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/SecondActivity.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/src/test/pkg/SecondActivity.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/SecondActivity.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/src/test/pkg/ThirdActivity.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/ThirdActivity.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/overdraw/src/test/pkg/ThirdActivity.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/ThirdActivity.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/proguard.cfg b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/proguard.cfg similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/proguard.cfg rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/proguard.cfg diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/proguard.pro b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/proguard.pro similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/proguard.pro rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/proguard.pro diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/proguard.properties b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/proguard.properties similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/proguard.properties rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/proguard.properties diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/project.properties1 b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties1 similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/project.properties1 rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties1 diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/project.properties2 b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties2 similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/project.properties2 rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties2 diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/project.properties3 b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties3 similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/project.properties3 rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties3 diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/project.properties4 b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties4 similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/project.properties4 rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties4 diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/protectedpermissions.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/protectedpermissions.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/protectedpermissions.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/protectedpermissions.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/protectedpermissions2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/protectedpermissions2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/protectedpermissions2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/protectedpermissions2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/AndroidManifest.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifest.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/AndroidManifest.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifest.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/AndroidManifestInner.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestInner.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/AndroidManifestInner.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestInner.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/AndroidManifestWrong.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestWrong.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/AndroidManifestWrong.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestWrong.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/AndroidManifestWrong2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestWrong2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/AndroidManifestWrong2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestWrong2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/Bar.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Bar.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/Bar.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Bar.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/Bar.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Bar.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/Bar.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Bar.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/Foo$Bar.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo$Bar.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/Foo$Bar.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo$Bar.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/Foo$Baz.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo$Baz.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/Foo$Baz.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo$Baz.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/Foo.class.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo.class.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/Foo.class.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo.class.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/Foo.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/registration/Foo.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg.9.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg.9.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg.9.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg.9.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg_focus.9.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg_focus.9.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg_focus.9.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg_focus.9.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-hdpi/filled.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/filled.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-hdpi/filled.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/filled.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-hdpi/ic_launcher.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-hdpi/ic_launcher.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/ic_launcher.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-hdpi/other.9.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/other.9.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-hdpi/other.9.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/other.9.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-hdpi/unrelated.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/unrelated.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-hdpi/unrelated.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/unrelated.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-mdpi/frame.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/frame.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-mdpi/frame.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/frame.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-mdpi/ic_menu_add_clip_normal.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/ic_menu_add_clip_normal.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-mdpi/ic_menu_add_clip_normal.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/ic_menu_add_clip_normal.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.gif b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.gif similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.gif rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.gif diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.jpg b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.jpg similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.jpg rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.jpg diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-mdpi/stat_notify_alarm.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/stat_notify_alarm.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-mdpi/stat_notify_alarm.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/stat_notify_alarm.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-nodpi/frame.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-nodpi/frame.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-nodpi/frame.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-nodpi/frame.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-xlarge-nodpi-v11/frame.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-xlarge-nodpi-v11/frame.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable-xlarge-nodpi-v11/frame.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-xlarge-nodpi-v11/frame.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable/ic_launcher.png b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/ic_launcher.png similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable/ic_launcher.png rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/ic_launcher.png diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable/ic_menu_help.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/ic_menu_help.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable/ic_menu_help.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/ic_menu_help.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable/states.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/states.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable/states.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/states.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable/states2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/states2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable/states2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/states2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable/states3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/states3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/drawable/states3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/states3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/accessibility.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/accessibility.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/accessibility.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/accessibility.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/accessibility2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/accessibility2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/accessibility2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/accessibility2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/activity_item_two_pane.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/activity_item_two_pane.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/activity_item_two_pane.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/activity_item_two_pane.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/baseline_weights.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/baseline_weights.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/baseline_weights2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/baseline_weights2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/baseline_weights3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/baseline_weights3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/breadcrumbs_in_fragment.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/breadcrumbs_in_fragment.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/breadcrumbs_in_fragment.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/breadcrumbs_in_fragment.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/broken.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/broken.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/broken.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/broken.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/buttonbar.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/buttonbar.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/buttonbar2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/buttonbar2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/buttonbar3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/buttonbar3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/buttonbar4.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar4.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/buttonbar4.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar4.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/buttonbar_suppressed.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar_suppressed.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/buttonbar_suppressed.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar_suppressed.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/casts.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/casts.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/casts2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/casts2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/casts3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/casts3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/casts4.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts4.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/casts4.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts4.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/compound.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/compound.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/compound.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/compound.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/compound2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/compound2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/compound2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/compound2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/compound3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/compound3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/compound3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/compound3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/crcrlf.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/crcrlf.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/crcrlf.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/crcrlf.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/crcrlf_ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/crcrlf_ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/crcrlf_ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/crcrlf_ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/customattrlayout.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/customattrlayout.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/customattrlayout.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/customattrlayout.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/customview.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/customview.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/customview.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/customview.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/customview2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/customview2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/customview2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/customview2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/default_item_badges.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/default_item_badges.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/default_item_badges.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/default_item_badges.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/deprecation.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/deprecation.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/deprecation.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/deprecation.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/detailed_item.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/detailed_item.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/detailed_item.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/detailed_item.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/duplicate.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/duplicate.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/duplicate.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/duplicate.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/edit_textview.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/edit_textview.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/edit_textview.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/edit_textview.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/edit_type.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/edit_type.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/edit_type.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/edit_type.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/encoding.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/encoding.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/encoding.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/encoding.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/encoding2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/encoding2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/encoding2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/encoding2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/fragment.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/fragment.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/fragment.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/fragment.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/gridlayout.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/gridlayout.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/gridlayout.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/gridlayout.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/has_children.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/has_children.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/has_children.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/has_children.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/has_children2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/has_children2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/has_children2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/has_children2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/ignores.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/ignores.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/ignores.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/ignores.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/inefficient_weight.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/inefficient_weight.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/inefficient_weight.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/inefficient_weight.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/inefficient_weight2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/inefficient_weight2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/inefficient_weight2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/inefficient_weight2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/labelfor.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/labelfor.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/labelfor.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/labelfor.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/labelfor_ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/labelfor_ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/labelfor_ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/labelfor_ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/layout1.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout1.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/layout1.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout1.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/layout1_ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout1_ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/layout1_ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout1_ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/layout2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/layout2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/layout3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/layout3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/layout4.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout4.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/layout4.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout4.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/listseparator.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/listseparator.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/listseparator.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/listseparator.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/namespace.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/namespace.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/namespace2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/namespace2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/namespace3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/namespace3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/namespace4.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace4.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/namespace4.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace4.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/nested_weights.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/nested_weights.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/nested_weights.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/nested_weights.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/nested_weights2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/nested_weights2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/nested_weights2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/nested_weights2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/note_edit.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/note_edit.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/note_edit.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/note_edit.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/now_playing_after.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/now_playing_after.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/now_playing_after.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/now_playing_after.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/onclick.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/onclick.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/onclick.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/onclick.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/private.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/private.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/private.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/private.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/scrolling.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/scrolling.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/scrolling.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/scrolling.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/simple.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/simple.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/simple.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/simple.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/simple_ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/simple_ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/simple_ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/simple_ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/simpleinclude.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/simpleinclude.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/simpleinclude.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/simpleinclude.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/size.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/size.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/size.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/size.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/size2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/size2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/size2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/size2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/sizeincluded.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/sizeincluded.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/sizeincluded.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/sizeincluded.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/textsize.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/textsize.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/textsize.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/textsize.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/too_deep.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/too_deep.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/too_deep.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/too_deep.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/too_many.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/too_many.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/too_many.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/too_many.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/unused_namespace.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/unused_namespace.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/unused_namespace.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/unused_namespace.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/useless.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/useless.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/useless.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/useless.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/useless2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/useless2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/useless2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/useless2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/useless3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/useless3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/useless3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/useless3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong0dp.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong0dp.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong0dp.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong0dp.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong_dimension.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_dimension.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong_dimension.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_dimension.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong_namespace.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong_namespace.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong_namespace2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong_namespace2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong_namespace3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong_namespace3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong_namespace4.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace4.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong_namespace4.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace4.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong_namespace5.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace5.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrong_namespace5.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace5.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams4.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams4.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams4.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams4.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams5.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams5.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams5.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams5.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams6.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams6.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams6.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams6.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams_ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams_ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/layout/wrongparams_ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams_ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/menu-land/actions.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/menu-land/actions.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/menu-land/actions2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/menu-land/actions2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/menu-land/actions2_ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions2_ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/menu-land/actions2_ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions2_ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/menu/menu.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu/menu.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/menu/menu.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu/menu.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/menu/titles.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu/titles.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/menu/titles.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu/titles.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/private_key.pem b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/private_key.pem similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/private_key.pem rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/private_key.pem diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-cs/arrays.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-cs/arrays.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-cs/arrays.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-cs/arrays.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-cs/strings.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-cs/strings.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-cs/strings.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-cs/strings.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-cs/translatedarrays.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-cs/translatedarrays.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-cs/translatedarrays.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-cs/translatedarrays.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-de-rDE/strings.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-de-rDE/strings.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-de-rDE/strings.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-de-rDE/strings.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-de/strings.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-de/strings.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-de/strings.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-de/strings.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-de/typos.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-de/typos.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-de/typos.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-de/typos.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es-rUS/strings.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es-rUS/strings.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es-rUS/strings.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es-rUS/strings.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es/donottranslate.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/donottranslate.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es/donottranslate.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/donottranslate.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es/formatstrings.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/formatstrings.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es/formatstrings.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/formatstrings.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es/formatstrings_ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/formatstrings_ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es/formatstrings_ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/formatstrings_ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es/strings.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es/strings.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es/strings_ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings_ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es/strings_ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings_ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es/strings_locale.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings_locale.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-es/strings_locale.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings_locale.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-fr/strings.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-fr/strings.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-fr/strings.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-fr/strings.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-it/stringarrays.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-it/stringarrays.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-it/stringarrays.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-it/stringarrays.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-land/arrays.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-land/arrays.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-land/arrays.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-land/arrays.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-land/arrays_ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-land/arrays_ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-land/arrays_ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-land/arrays_ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-land/strings.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-land/strings.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-land/strings.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-land/strings.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-nb/typos.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nb/typos.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-nb/typos.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nb/typos.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-nb/typos_locale.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nb/typos_locale.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-nb/typos_locale.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nb/typos_locale.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-nl-rNL/arrays.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nl-rNL/arrays.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-nl-rNL/arrays.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nl-rNL/arrays.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-nl-rNL/strings.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nl-rNL/strings.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values-nl-rNL/strings.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nl-rNL/strings.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/arrays.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/arrays.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/arrays.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/arrays.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/arrayusage.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/arrayusage.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/arrayusage.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/arrayusage.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/buttonbar-values.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/buttonbar-values.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/buttonbar-values.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/buttonbar-values.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/customattr.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/customattr.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/customattr.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/customattr.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings-version1.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings-version1.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings-version1.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings-version1.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings-version2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings-version2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings-version2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings-version2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings4.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings4.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings4.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings4.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings_ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings_ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/formatstrings_ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings_ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/nontranslatable.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/nontranslatable.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/nontranslatable.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/nontranslatable.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/nontranslatable2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/nontranslatable2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/nontranslatable2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/nontranslatable2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/plurals.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/plurals.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/plurals.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/plurals.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/pxsp.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/pxsp.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/pxsp.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/pxsp.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/sizestyles.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/sizestyles.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/sizestyles.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/sizestyles.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/stringarrays.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/stringarrays.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/stringarrays.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/stringarrays.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/strings.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/strings.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/strings2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/strings2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/strings3.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings3.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/strings3.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings3.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/strings4.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings4.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/strings4.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings4.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/strings_ignore.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings_ignore.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/strings_ignore.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings_ignore.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/stylecycle.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/stylecycle.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/stylecycle.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/stylecycle.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/styles.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/styles.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/styles.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/styles.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/themes.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/themes.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/themes.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/themes.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/themes2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/themes2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/themes2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/themes2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/translatedarrays.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/translatedarrays.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/translatedarrays.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/translatedarrays.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/typography.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/typography.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/typography.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/typography.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/typos.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/typos.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/res/values/typos.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/typos.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/my/pkg/Test.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/my/pkg/Test.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/my/pkg/Test.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/my/pkg/Test.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/pkg1/Class1.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/pkg1/Class1.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/pkg1/Class1.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/pkg1/Class1.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/pkg2/Class2.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/pkg2/Class2.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/pkg2/Class2.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/pkg2/Class2.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/ActionBarTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionBarTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/ActionBarTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionBarTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1_ignore.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1_ignore.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1_ignore.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1_ignore.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/ActionTest2.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest2.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/ActionTest2.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest2.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/BadImport.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/BadImport.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/BadImport.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/BadImport.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/CustomViewTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/CustomViewTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/CustomViewTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/CustomViewTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/Foo.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Foo.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/Foo.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Foo.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/Hidden.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Hidden.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/Hidden.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Hidden.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/ImportFrameActivity.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ImportFrameActivity.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/ImportFrameActivity.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ImportFrameActivity.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/InflaterTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/InflaterTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/InflaterTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/InflaterTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/JavaPerformanceTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/JavaPerformanceTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/JavaPerformanceTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/JavaPerformanceTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/NonInternationalizedSmsDetectorTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/NonInternationalizedSmsDetectorTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/NonInternationalizedSmsDetectorTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/NonInternationalizedSmsDetectorTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/NotificationTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/NotificationTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/NotificationTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/NotificationTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/PasteError.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/PasteError.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/PasteError.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/PasteError.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SdCardTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SdCardTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SdCardTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SdCardTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SetJavaScriptEnabled.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SetJavaScriptEnabled.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SetJavaScriptEnabled.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SetJavaScriptEnabled.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest2.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest2.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest2.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest2.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest3.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest3.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest3.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest3.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest4.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest4.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest4.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest4.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest5.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest5.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest5.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest5.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/StringFormat2.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormat2.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/StringFormat2.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormat2.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity2.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity2.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity2.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity2.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity_ignore.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity_ignore.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity_ignore.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity_ignore.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SuppressTest5.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SuppressTest5.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/SuppressTest5.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SuppressTest5.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/ToastTest.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ToastTest.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/ToastTest.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ToastTest.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/UnusedReference.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/UnusedReference.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/UnusedReference.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/UnusedReference.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/Utf8BomTest.java.data b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Utf8BomTest.java.data similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/Utf8BomTest.java.data rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Utf8BomTest.java.data diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/WorldWriteableFile.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WorldWriteableFile.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/WorldWriteableFile.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WorldWriteableFile.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/WrongAnnotation.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongAnnotation.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/WrongAnnotation.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongAnnotation.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity2.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity2.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity2.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity2.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity3.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity3.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity3.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity3.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/WrongColor.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongColor.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/src/test/pkg/WrongColor.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongColor.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/unusedR.java.txt b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/unusedR.java.txt similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/unusedR.java.txt rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/unusedR.java.txt diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/wrongid/ids.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/ids.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/wrongid/ids.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/ids.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/wrongid/ignorelayout1.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/ignorelayout1.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/wrongid/ignorelayout1.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/ignorelayout1.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/wrongid/layout1.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/layout1.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/wrongid/layout1.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/layout1.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/wrongid/layout2.xml b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/layout2.xml similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/data/wrongid/layout2.xml rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/layout2.xml diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/client/api/DefaultSdkInfoTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/client/api/DefaultSdkInfoTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/client/api/DefaultSdkInfoTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/client/api/DefaultSdkInfoTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/client/api/LintClientTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/client/api/LintClientTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/client/api/LintClientTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/client/api/LintClientTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/client/api/LintDriverTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/client/api/LintDriverTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/client/api/LintDriverTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/client/api/LintDriverTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/ClassContextTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/ClassContextTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/ClassContextTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/ClassContextTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/IssueTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/IssueTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/IssueTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/IssueTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/LintUtilsTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/LintUtilsTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/LintUtilsTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/LintUtilsTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/LocationTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/LocationTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/LocationTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/LocationTest.java diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/ScopeTest.java b/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/ScopeTest.java similarity index 100% rename from lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/ScopeTest.java rename to lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/ScopeTest.java diff --git a/lint/libs/lint_checks/tests/.settings/org.eclipse.core.resources.prefs b/lint/libs/lint_checks/tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 52d66cb950bcb9f423c8841fab6f8a740c5b8a97..0000000000000000000000000000000000000000 --- a/lint/libs/lint_checks/tests/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/com/android/tools/lint/checks/TypoDetectorTest.java=UTF-8 -encoding//src/com/android/tools/lint/checks/TypoLookupTest.java=UTF-8 -encoding//src/com/android/tools/lint/checks/TypographyDetectorTest.java=UTF-8 -encoding//src/com/android/tools/lint/checks/data/res/values-nb/typos.xml=UTF-8 diff --git a/lint/libs/lint_checks/tests/Android.mk b/lint/libs/lint_checks/tests/Android.mk deleted file mode 100644 index cfbf7344063fcc726fcdbd850278cf4aac3c8ed3..0000000000000000000000000000000000000000 --- a/lint/libs/lint_checks/tests/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2010 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 := lint_checks-tests -LOCAL_MODULE_TAGS := optional - -LOCAL_JAVA_LIBRARIES := common sdklib lint_api lint_checks lint junit easymock asm-tools asm-tree-tools guava-tools layoutlib_api sdktestutils - -include $(BUILD_HOST_JAVA_LIBRARY) - -# Build all sub-directories -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/manifmerger/.classpath b/manifmerger/.classpath index d042f2322c86e098b1805920de4bccc73c5fa661..c0005b9a5d28ce7b0eec89622d3f35729f0640dd 100644 --- a/manifmerger/.classpath +++ b/manifmerger/.classpath @@ -1,7 +1,6 @@ - - + diff --git a/manifmerger/Android.mk b/manifmerger/Android.mk index 093d5b3cc11cf3524dfd6428ae3adad546d07736..28dbe8227bfee7d3fa46eb15bb253b22ed22b9b8 100644 --- a/manifmerger/Android.mk +++ b/manifmerger/Android.mk @@ -3,10 +3,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java) LOCAL_JAVA_RESOURCE_DIRS := -LOCAL_SRC_FILES := $(call all-java-files-under,src) - LOCAL_JAR_MANIFEST := etc/manifest.txt LOCAL_JAVA_LIBRARIES := \ common \ @@ -15,3 +14,17 @@ LOCAL_MODULE := manifmerger LOCAL_MODULE_TAGS := optional include $(BUILD_HOST_JAVA_LIBRARY) + +# Build tests +include $(CLEAR_VARS) + +# Only compile source java files in this lib. +LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java) +LOCAL_JAVA_RESOURCE_DIRS := src/test/java + +LOCAL_MODULE := manifmerger-tests +LOCAL_MODULE_TAGS := optional + +LOCAL_JAVA_LIBRARIES := manifmerger sdklib-tests junit + +include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/manifmerger/build.gradle b/manifmerger/build.gradle index 1db9c0439adfe01f24dfdf1dba0bfcf085415b2e..9e9bef2a98ae2d3bfc5c7d8427f5a65ca6c3aab2 100644 --- a/manifmerger/build.gradle +++ b/manifmerger/build.gradle @@ -20,22 +20,8 @@ group = 'com.android.tools.build' archivesBaseName = 'manifest-merger' sourceSets { - main { - java { - srcDir 'src' - } - resources { - srcDir 'src' - } - } - test { - java { - srcDir 'tests/src' - } - resources { - srcDir 'tests/src' - } - } + main.resources.srcDir 'src/main/java' + test.resources.srcDir 'src/test/java' } uploadArchives { diff --git a/manifmerger/src/com/android/manifmerger/ArgvParser.java b/manifmerger/src/main/java/com/android/manifmerger/ArgvParser.java similarity index 100% rename from manifmerger/src/com/android/manifmerger/ArgvParser.java rename to manifmerger/src/main/java/com/android/manifmerger/ArgvParser.java diff --git a/manifmerger/src/com/android/manifmerger/ICallback.java b/manifmerger/src/main/java/com/android/manifmerger/ICallback.java similarity index 100% rename from manifmerger/src/com/android/manifmerger/ICallback.java rename to manifmerger/src/main/java/com/android/manifmerger/ICallback.java diff --git a/manifmerger/src/com/android/manifmerger/IMergerLog.java b/manifmerger/src/main/java/com/android/manifmerger/IMergerLog.java similarity index 100% rename from manifmerger/src/com/android/manifmerger/IMergerLog.java rename to manifmerger/src/main/java/com/android/manifmerger/IMergerLog.java diff --git a/manifmerger/src/com/android/manifmerger/Main.java b/manifmerger/src/main/java/com/android/manifmerger/Main.java similarity index 100% rename from manifmerger/src/com/android/manifmerger/Main.java rename to manifmerger/src/main/java/com/android/manifmerger/Main.java diff --git a/manifmerger/src/com/android/manifmerger/ManifestMerger.java b/manifmerger/src/main/java/com/android/manifmerger/ManifestMerger.java similarity index 100% rename from manifmerger/src/com/android/manifmerger/ManifestMerger.java rename to manifmerger/src/main/java/com/android/manifmerger/ManifestMerger.java diff --git a/manifmerger/src/com/android/manifmerger/MergerLog.java b/manifmerger/src/main/java/com/android/manifmerger/MergerLog.java similarity index 100% rename from manifmerger/src/com/android/manifmerger/MergerLog.java rename to manifmerger/src/main/java/com/android/manifmerger/MergerLog.java diff --git a/manifmerger/src/com/android/manifmerger/MergerXmlUtils.java b/manifmerger/src/main/java/com/android/manifmerger/MergerXmlUtils.java similarity index 100% rename from manifmerger/src/com/android/manifmerger/MergerXmlUtils.java rename to manifmerger/src/main/java/com/android/manifmerger/MergerXmlUtils.java diff --git a/manifmerger/tests/src/com/android/manifmerger/ManifestMergerTest.java b/manifmerger/src/test/java/com/android/manifmerger/ManifestMergerTest.java similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/ManifestMergerTest.java rename to manifmerger/src/test/java/com/android/manifmerger/ManifestMergerTest.java diff --git a/manifmerger/tests/src/com/android/manifmerger/ManifestMergerTestCase.java b/manifmerger/src/test/java/com/android/manifmerger/ManifestMergerTestCase.java similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/ManifestMergerTestCase.java rename to manifmerger/src/test/java/com/android/manifmerger/ManifestMergerTestCase.java diff --git a/manifmerger/tests/src/com/android/manifmerger/data/00_noop.xml b/manifmerger/src/test/java/com/android/manifmerger/data/00_noop.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/00_noop.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/00_noop.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/01_ignore_app_attr.xml b/manifmerger/src/test/java/com/android/manifmerger/data/01_ignore_app_attr.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/01_ignore_app_attr.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/01_ignore_app_attr.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/02_ignore_instrumentation.xml b/manifmerger/src/test/java/com/android/manifmerger/data/02_ignore_instrumentation.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/02_ignore_instrumentation.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/02_ignore_instrumentation.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/03_inject_attributes.xml b/manifmerger/src/test/java/com/android/manifmerger/data/03_inject_attributes.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/03_inject_attributes.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/03_inject_attributes.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/04_inject_attributes.xml b/manifmerger/src/test/java/com/android/manifmerger/data/04_inject_attributes.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/04_inject_attributes.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/04_inject_attributes.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/10_activity_merge.xml b/manifmerger/src/test/java/com/android/manifmerger/data/10_activity_merge.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/10_activity_merge.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/10_activity_merge.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/11_activity_dup.xml b/manifmerger/src/test/java/com/android/manifmerger/data/11_activity_dup.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/11_activity_dup.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/11_activity_dup.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/12_alias_dup.xml b/manifmerger/src/test/java/com/android/manifmerger/data/12_alias_dup.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/12_alias_dup.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/12_alias_dup.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/13_service_dup.xml b/manifmerger/src/test/java/com/android/manifmerger/data/13_service_dup.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/13_service_dup.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/13_service_dup.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/14_receiver_dup.xml b/manifmerger/src/test/java/com/android/manifmerger/data/14_receiver_dup.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/14_receiver_dup.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/14_receiver_dup.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/15_provider_dup.xml b/manifmerger/src/test/java/com/android/manifmerger/data/15_provider_dup.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/15_provider_dup.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/15_provider_dup.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/16_fqcn_merge.xml b/manifmerger/src/test/java/com/android/manifmerger/data/16_fqcn_merge.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/16_fqcn_merge.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/16_fqcn_merge.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/17_fqcn_conflict.xml b/manifmerger/src/test/java/com/android/manifmerger/data/17_fqcn_conflict.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/17_fqcn_conflict.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/17_fqcn_conflict.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/20_uses_lib_merge.xml b/manifmerger/src/test/java/com/android/manifmerger/data/20_uses_lib_merge.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/20_uses_lib_merge.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/20_uses_lib_merge.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/21_uses_lib_errors.xml b/manifmerger/src/test/java/com/android/manifmerger/data/21_uses_lib_errors.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/21_uses_lib_errors.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/21_uses_lib_errors.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/25_permission_merge.xml b/manifmerger/src/test/java/com/android/manifmerger/data/25_permission_merge.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/25_permission_merge.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/25_permission_merge.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/26_permission_dup.xml b/manifmerger/src/test/java/com/android/manifmerger/data/26_permission_dup.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/26_permission_dup.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/26_permission_dup.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/28_uses_perm_merge.xml b/manifmerger/src/test/java/com/android/manifmerger/data/28_uses_perm_merge.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/28_uses_perm_merge.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/28_uses_perm_merge.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/30_uses_sdk_ok.xml b/manifmerger/src/test/java/com/android/manifmerger/data/30_uses_sdk_ok.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/30_uses_sdk_ok.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/30_uses_sdk_ok.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/32_uses_sdk_minsdk_ok.xml b/manifmerger/src/test/java/com/android/manifmerger/data/32_uses_sdk_minsdk_ok.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/32_uses_sdk_minsdk_ok.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/32_uses_sdk_minsdk_ok.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/33_uses_sdk_minsdk_conflict.xml b/manifmerger/src/test/java/com/android/manifmerger/data/33_uses_sdk_minsdk_conflict.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/33_uses_sdk_minsdk_conflict.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/33_uses_sdk_minsdk_conflict.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/36_uses_sdk_targetsdk_warning.xml b/manifmerger/src/test/java/com/android/manifmerger/data/36_uses_sdk_targetsdk_warning.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/36_uses_sdk_targetsdk_warning.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/36_uses_sdk_targetsdk_warning.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/40_uses_feat_merge.xml b/manifmerger/src/test/java/com/android/manifmerger/data/40_uses_feat_merge.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/40_uses_feat_merge.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/40_uses_feat_merge.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/41_uses_feat_errors.xml b/manifmerger/src/test/java/com/android/manifmerger/data/41_uses_feat_errors.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/41_uses_feat_errors.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/41_uses_feat_errors.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/45_uses_feat_gles_once.xml b/manifmerger/src/test/java/com/android/manifmerger/data/45_uses_feat_gles_once.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/45_uses_feat_gles_once.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/45_uses_feat_gles_once.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/47_uses_feat_gles_conflict.xml b/manifmerger/src/test/java/com/android/manifmerger/data/47_uses_feat_gles_conflict.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/47_uses_feat_gles_conflict.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/47_uses_feat_gles_conflict.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/50_uses_conf_warning.xml b/manifmerger/src/test/java/com/android/manifmerger/data/50_uses_conf_warning.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/50_uses_conf_warning.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/50_uses_conf_warning.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/52_support_screens_warning.xml b/manifmerger/src/test/java/com/android/manifmerger/data/52_support_screens_warning.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/52_support_screens_warning.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/52_support_screens_warning.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/54_compat_screens_warning.xml b/manifmerger/src/test/java/com/android/manifmerger/data/54_compat_screens_warning.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/54_compat_screens_warning.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/54_compat_screens_warning.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/56_support_gltext_warning.xml b/manifmerger/src/test/java/com/android/manifmerger/data/56_support_gltext_warning.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/56_support_gltext_warning.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/56_support_gltext_warning.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/60_merge_order.xml b/manifmerger/src/test/java/com/android/manifmerger/data/60_merge_order.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/60_merge_order.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/60_merge_order.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/65_override_app.xml b/manifmerger/src/test/java/com/android/manifmerger/data/65_override_app.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/65_override_app.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/65_override_app.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/66_remove_app.xml b/manifmerger/src/test/java/com/android/manifmerger/data/66_remove_app.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/66_remove_app.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/66_remove_app.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/67_override_activities.xml b/manifmerger/src/test/java/com/android/manifmerger/data/67_override_activities.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/67_override_activities.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/67_override_activities.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/68_override_uses.xml b/manifmerger/src/test/java/com/android/manifmerger/data/68_override_uses.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/68_override_uses.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/68_override_uses.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/69_remove_uses.xml b/manifmerger/src/test/java/com/android/manifmerger/data/69_remove_uses.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/69_remove_uses.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/69_remove_uses.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/70_expand_fqcns.xml b/manifmerger/src/test/java/com/android/manifmerger/data/70_expand_fqcns.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/70_expand_fqcns.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/70_expand_fqcns.xml diff --git a/manifmerger/tests/src/com/android/manifmerger/data/71_prefixes_enable_extractprefix.xml b/manifmerger/src/test/java/com/android/manifmerger/data/71_prefixes_enable_extractprefix.xml similarity index 100% rename from manifmerger/tests/src/com/android/manifmerger/data/71_prefixes_enable_extractprefix.xml rename to manifmerger/src/test/java/com/android/manifmerger/data/71_prefixes_enable_extractprefix.xml diff --git a/manifmerger/tests/Android.mk b/manifmerger/tests/Android.mk deleted file mode 100755 index 9314106773bfd5ad281bad25d5857e564df4f37e..0000000000000000000000000000000000000000 --- a/manifmerger/tests/Android.mk +++ /dev/null @@ -1,28 +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_JAVA_RESOURCE_DIRS := src - -LOCAL_MODULE := manifmerger-tests -LOCAL_MODULE_TAGS := optional - -LOCAL_JAVA_LIBRARIES := manifmerger sdklib-tests junit - -include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/sdkmanager/libs/sdklib/.classpath b/sdkmanager/libs/sdklib/.classpath index 476a32049232605c2cbc2db89bf2f66c7336e23d..b2642d7b4f30fab6002b8bee92dd5e8e4c70c292 100644 --- a/sdkmanager/libs/sdklib/.classpath +++ b/sdkmanager/libs/sdklib/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/sdkmanager/libs/sdklib/.settings/org.eclipse.core.resources.prefs b/sdkmanager/libs/sdklib/.settings/org.eclipse.core.resources.prefs index b6a93e06adc5529338432e235c71ac8c0d563404..3d65728915688d10c32c63f4786f7e5cb04e4418 100755 --- a/sdkmanager/libs/sdklib/.settings/org.eclipse.core.resources.prefs +++ b/sdkmanager/libs/sdklib/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,4 @@ #Mon Aug 29 11:46:20 PDT 2011 eclipse.preferences.version=1 -encoding//tests/com/android/sdklib/testdata/addon_sample_1.xml=UTF-8 -encoding//tests/src/com/android/sdklib/io/MockFileOpTest.java=UTF-8 +encoding//src/test/java/com/android/sdklib/testdata/addon_sample_1.xml=UTF-8 +encoding//src/test/java/com/android/sdklib/io/MockFileOpTest.java=UTF-8 diff --git a/sdkmanager/libs/sdklib/Android.mk b/sdkmanager/libs/sdklib/Android.mk index 30c4e04babc37ad5024bbd3f4eaa4ec64b3403f5..e5e1a27cba6eec34c246d2ea9270ed645287f652 100644 --- a/sdkmanager/libs/sdklib/Android.mk +++ b/sdkmanager/libs/sdklib/Android.mk @@ -16,8 +16,8 @@ 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/java LOCAL_JAR_MANIFEST := manifest.txt @@ -43,5 +43,16 @@ LOCAL_MODULE := sdklib include $(BUILD_HOST_JAVA_LIBRARY) -# Build all sub-directories -include $(call all-makefiles-under,$(LOCAL_PATH)) +# Build tests +include $(CLEAR_VARS) + +# Only compile source java files in this lib. +LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java) +LOCAL_JAVA_RESOURCE_DIRS := src/test/java + +LOCAL_MODULE := sdklib-tests +LOCAL_MODULE_TAGS := optional + +LOCAL_JAVA_LIBRARIES := sdklib junit dvlib-tests + +include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/sdkmanager/libs/sdklib/build.gradle b/sdkmanager/libs/sdklib/build.gradle index 346dc6b0513431b1653f7d454264a4f75350d2bd..6b1c0fd6978bd8a545e2583200ecba23ec40b26d 100644 --- a/sdkmanager/libs/sdklib/build.gradle +++ b/sdkmanager/libs/sdklib/build.gradle @@ -24,22 +24,8 @@ group = 'com.android.tools.sdk' archivesBaseName = 'sdklib' sourceSets { - main { - java { - srcDir 'src' - } - resources { - srcDir 'src' - } - } - test { - java { - srcDir 'tests/src' - } - resources { - srcDir 'tests/src' - } - } + main.resources.srcDir 'src/main/java' + test.resources.srcDir 'src/test/java' } uploadArchives { diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/AddOnTarget.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/AddOnTarget.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/AddOnTarget.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/AddOnTarget.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/AndroidVersion.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/AndroidVersion.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/AndroidVersion.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/AndroidVersion.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/IAndroidTarget.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/IAndroidTarget.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/IAndroidTarget.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/IAndroidTarget.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/ISystemImage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/ISystemImage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/ISystemImage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/ISystemImage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/PlatformTarget.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/PlatformTarget.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/PlatformTarget.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/PlatformTarget.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/SdkManager.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/SdkManager.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/SystemImage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/SystemImage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/SystemImage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/SystemImage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilder.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/ApkBuilder.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilder.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/ApkBuilder.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilderMain.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/ApkBuilderMain.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilderMain.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/ApkBuilderMain.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkCreationException.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/ApkCreationException.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkCreationException.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/ApkCreationException.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/DuplicateFileException.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/DuplicateFileException.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/build/DuplicateFileException.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/DuplicateFileException.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/IArchiveBuilder.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/IArchiveBuilder.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/build/IArchiveBuilder.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/IArchiveBuilder.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/JarListSanitizer.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/JarListSanitizer.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/build/JarListSanitizer.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/JarListSanitizer.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/SealedApkException.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/SealedApkException.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/build/SealedApkException.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/build/SealedApkException.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Abi.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Abi.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Abi.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Abi.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/BluetoothProfile.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/BluetoothProfile.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/BluetoothProfile.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/BluetoothProfile.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/ButtonType.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/ButtonType.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/ButtonType.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/ButtonType.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Camera.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Camera.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Camera.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Camera.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/CameraLocation.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/CameraLocation.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/CameraLocation.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/CameraLocation.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Device.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Device.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Device.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Device.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/DeviceManager.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/DeviceManager.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceParser.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/DeviceParser.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceParser.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/DeviceParser.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceWriter.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/DeviceWriter.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceWriter.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/DeviceWriter.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Hardware.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Hardware.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Hardware.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Hardware.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Meta.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Meta.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Meta.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Meta.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Multitouch.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Multitouch.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Multitouch.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Multitouch.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Network.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Network.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Network.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Network.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/PowerType.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/PowerType.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/PowerType.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/PowerType.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Screen.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Screen.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Screen.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Screen.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/ScreenType.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/ScreenType.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/ScreenType.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/ScreenType.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Sensor.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Sensor.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Sensor.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Sensor.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Software.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Software.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Software.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Software.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/State.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/State.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/State.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/State.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Storage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Storage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Storage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/Storage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/devices.xml b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/devices.xml similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/devices/devices.xml rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/devices/devices.xml diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdInfo.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/avd/AvdInfo.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdInfo.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/avd/AvdInfo.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/avd/AvdManager.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/avd/AvdManager.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/HardwareProperties.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/avd/HardwareProperties.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/HardwareProperties.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/avd/HardwareProperties.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/BuildConfig.template b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/BuildConfig.template similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/BuildConfig.template rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/BuildConfig.template diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/BuildConfigGenerator.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/BuildConfigGenerator.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/BuildConfigGenerator.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/BuildConfigGenerator.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/DebugKeyProvider.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/DebugKeyProvider.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/DebugKeyProvider.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/DebugKeyProvider.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/KeystoreHelper.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/KeystoreHelper.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/KeystoreHelper.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/KeystoreHelper.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/SignedJarBuilder.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/SignedJarBuilder.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/SignedJarBuilder.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/SignedJarBuilder.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/SymbolLoader.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/SymbolLoader.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/SymbolLoader.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/SymbolLoader.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/SymbolWriter.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/SymbolWriter.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/SymbolWriter.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/SymbolWriter.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/IPropertySource.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/project/IPropertySource.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/IPropertySource.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/project/IPropertySource.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/project/ProjectCreator.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/project/ProjectCreator.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/project/ProjectProperties.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/project/ProjectProperties.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectPropertiesWorkingCopy.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/project/ProjectPropertiesWorkingCopy.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectPropertiesWorkingCopy.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/project/ProjectPropertiesWorkingCopy.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AdbWrapper.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/AdbWrapper.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AdbWrapper.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/AdbWrapper.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonsListFetcher.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/AddonsListFetcher.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonsListFetcher.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/AddonsListFetcher.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/CanceledByUserException.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/CanceledByUserException.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/CanceledByUserException.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/CanceledByUserException.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/DownloadCache.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/DownloadCache.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/DownloadCache.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/DownloadCache.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IDescription.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/IDescription.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/IDescription.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/IDescription.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ITask.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/ITask.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ITask.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/ITask.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ITaskFactory.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/ITaskFactory.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ITaskFactory.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/ITaskFactory.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ITaskMonitor.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/ITaskMonitor.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ITaskMonitor.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/ITaskMonitor.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LocalSdkParser.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/LocalSdkParser.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LocalSdkParser.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/LocalSdkParser.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/NullTaskMonitor.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/NullTaskMonitor.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/NullTaskMonitor.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/NullTaskMonitor.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkStats.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/SdkStats.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkStats.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/SdkStats.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/UrlOpener.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/UrlOpener.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/UrlOpener.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/UrlOpener.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/UserCredentials.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/UserCredentials.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/UserCredentials.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/UserCredentials.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/Archive.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/archives/Archive.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/Archive.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/archives/Archive.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/ArchiveInstaller.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/archives/ArchiveInstaller.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/ArchiveInstaller.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/archives/ArchiveInstaller.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/ArchiveReplacement.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/archives/ArchiveReplacement.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/ArchiveReplacement.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/archives/ArchiveReplacement.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/AddonPackage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/AddonPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/AddonPackage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/AddonPackage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/BrokenPackage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/BrokenPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/BrokenPackage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/BrokenPackage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/DocPackage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/DocPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/DocPackage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/DocPackage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ExtraPackage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/ExtraPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ExtraPackage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/ExtraPackage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/FullRevision.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/FullRevision.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/FullRevision.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/FullRevision.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/FullRevisionPackage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/FullRevisionPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/FullRevisionPackage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/FullRevisionPackage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IAndroidVersionProvider.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IAndroidVersionProvider.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IAndroidVersionProvider.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IAndroidVersionProvider.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IExactApiLevelDependency.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IExactApiLevelDependency.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IExactApiLevelDependency.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IExactApiLevelDependency.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IFullRevisionProvider.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IFullRevisionProvider.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IFullRevisionProvider.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IFullRevisionProvider.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ILayoutlibVersion.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/ILayoutlibVersion.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ILayoutlibVersion.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/ILayoutlibVersion.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IMinApiLevelDependency.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IMinApiLevelDependency.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IMinApiLevelDependency.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IMinApiLevelDependency.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IMinPlatformToolsDependency.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IMinPlatformToolsDependency.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IMinPlatformToolsDependency.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IMinPlatformToolsDependency.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IMinToolsDependency.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IMinToolsDependency.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IMinToolsDependency.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IMinToolsDependency.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IPlatformDependency.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IPlatformDependency.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/IPlatformDependency.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/IPlatformDependency.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/LayoutlibVersionMixin.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/LayoutlibVersionMixin.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/LayoutlibVersionMixin.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/LayoutlibVersionMixin.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/MajorRevision.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/MajorRevision.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/MajorRevision.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/MajorRevision.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/MajorRevisionPackage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/MajorRevisionPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/MajorRevisionPackage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/MajorRevisionPackage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/MinToolsPackage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/MinToolsPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/MinToolsPackage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/MinToolsPackage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/Package.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/Package.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/Package.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/Package.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/PackageParserUtils.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/PackageParserUtils.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/PackageParserUtils.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/PackageParserUtils.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/PlatformPackage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/PlatformPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/PlatformPackage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/PlatformPackage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/PlatformToolPackage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/PlatformToolPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/PlatformToolPackage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/PlatformToolPackage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/SamplePackage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/SamplePackage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/SamplePackage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/SamplePackage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/SourcePackage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/SourcePackage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/SourcePackage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/SourcePackage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/SystemImagePackage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/SystemImagePackage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/SystemImagePackage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/SystemImagePackage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ToolPackage.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/ToolPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ToolPackage.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/packages/ToolPackage.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkAddonSource.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkAddonSource.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkAddonSource.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkAddonSource.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkRepoSource.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkRepoSource.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkRepoSource.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkRepoSource.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSource.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkSource.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSource.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkSource.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSourceCategory.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkSourceCategory.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSourceCategory.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkSourceCategory.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSourceProperties.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkSourceProperties.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSourceProperties.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkSourceProperties.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSources.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkSources.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSources.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkSources.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSysImgSource.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkSysImgSource.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSysImgSource.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/repository/sources/SdkSysImgSource.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/io/FileOp.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/io/FileOp.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/io/FileOp.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/io/FileOp.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/io/IFileOp.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/io/IFileOp.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/io/IFileOp.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/io/IFileOp.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/io/NonClosingInputStream.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/io/NonClosingInputStream.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/io/NonClosingInputStream.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/io/NonClosingInputStream.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/PkgProps.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/PkgProps.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/PkgProps.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/PkgProps.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/README.txt b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/README.txt similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/README.txt rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/README.txt diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/RepoConstants.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/RepoConstants.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/RepoConstants.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/RepoConstants.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkAddonConstants.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/SdkAddonConstants.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkAddonConstants.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/SdkAddonConstants.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkAddonsListConstants.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/SdkAddonsListConstants.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkAddonsListConstants.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/SdkAddonsListConstants.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepoConstants.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/SdkRepoConstants.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepoConstants.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/SdkRepoConstants.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkStatsConstants.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/SdkStatsConstants.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkStatsConstants.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/SdkStatsConstants.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkSysImgConstants.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/SdkSysImgConstants.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkSysImgConstants.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/SdkSysImgConstants.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addon-1.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addon-1.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addon-1.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addon-1.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addon-2.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addon-2.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addon-2.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addon-2.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addon-3.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addon-3.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addon-3.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addon-3.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addon-4.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addon-4.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addon-4.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addon-4.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addon-5.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addon-5.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addon-5.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addon-5.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addons-list-1.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addons-list-1.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addons-list-1.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addons-list-1.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addons-list-2.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addons-list-2.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-addons-list-2.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-addons-list-2.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-1.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-1.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-1.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-1.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-2.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-2.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-2.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-2.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-3.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-3.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-3.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-3.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-4.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-4.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-4.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-4.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-5.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-5.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-5.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-5.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-6.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-6.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-6.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-6.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-7.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-7.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository-7.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-repository-7.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-stats-1.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-stats-1.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-stats-1.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-stats-1.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-sys-img-1.xsd b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-sys-img-1.xsd similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-sys-img-1.xsd rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/repository/sdk-sys-img-1.xsd diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/util/ArrayUtils.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/ArrayUtils.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/util/ArrayUtils.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/ArrayUtils.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/util/CommandLineParser.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/CommandLineParser.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/util/CommandLineParser.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/CommandLineParser.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/util/FormatUtils.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/FormatUtils.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/util/FormatUtils.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/FormatUtils.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/util/GrabProcessOutput.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/GrabProcessOutput.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/util/GrabProcessOutput.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/GrabProcessOutput.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/util/LineUtil.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/LineUtil.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/util/LineUtil.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/LineUtil.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/util/SparseArray.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/SparseArray.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/util/SparseArray.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/SparseArray.java diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/util/SparseIntArray.java b/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/SparseIntArray.java similarity index 100% rename from sdkmanager/libs/sdklib/src/com/android/sdklib/util/SparseIntArray.java rename to sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/util/SparseIntArray.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/AndroidVersionTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/AndroidVersionTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/AndroidVersionTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/AndroidVersionTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/LayoutlibVersionTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/LayoutlibVersionTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/LayoutlibVersionTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/LayoutlibVersionTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/SdkManagerTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/SdkManagerTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/SdkManagerTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/SdkManagerTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/SdkManagerTestCase.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/SdkManagerTestCase.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/SdkManagerTestCase.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/SdkManagerTestCase.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/devices/DeviceParserTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/devices/DeviceParserTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/devices/DeviceParserTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/devices/DeviceParserTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/devices/DeviceWriterTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/devices/DeviceWriterTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/devices/DeviceWriterTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/devices/DeviceWriterTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/build/DebugKeyProviderTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/build/DebugKeyProviderTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/build/DebugKeyProviderTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/build/DebugKeyProviderTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/build/SymbolLoaderTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/build/SymbolLoaderTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/build/SymbolLoaderTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/build/SymbolLoaderTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/build/SymbolWriterTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/build/SymbolWriterTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/build/SymbolWriterTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/build/SymbolWriterTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/AddonsListFetcherTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/AddonsListFetcherTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/AddonsListFetcherTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/AddonsListFetcherTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/LocalSdkParserTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/LocalSdkParserTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/LocalSdkParserTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/LocalSdkParserTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockEmptySdkManager.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/MockEmptySdkManager.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockEmptySdkManager.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/MockEmptySdkManager.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockMonitor.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/MockMonitor.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockMonitor.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/MockMonitor.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformTarget.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/MockPlatformTarget.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformTarget.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/MockPlatformTarget.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SdkStatsTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/SdkStatsTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SdkStatsTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/SdkStatsTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/archives/ArchiveInstallerTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/archives/ArchiveInstallerTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/archives/ArchiveInstallerTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/archives/ArchiveInstallerTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/archives/ArchiveTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/archives/ArchiveTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/archives/ArchiveTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/archives/ArchiveTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/BrokenPackageTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/BrokenPackageTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/BrokenPackageTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/BrokenPackageTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/ExtraPackageTest_v3.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/ExtraPackageTest_v3.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/ExtraPackageTest_v3.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/ExtraPackageTest_v3.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/ExtraPackageTest_v4.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/ExtraPackageTest_v4.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/ExtraPackageTest_v4.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/ExtraPackageTest_v4.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/FullRevisionPackageTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/FullRevisionPackageTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/FullRevisionPackageTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/FullRevisionPackageTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/FullRevisionTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/FullRevisionTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/FullRevisionTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/FullRevisionTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MajorRevisionTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MajorRevisionTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MajorRevisionTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MajorRevisionTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MinToolsPackageTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MinToolsPackageTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MinToolsPackageTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MinToolsPackageTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockAddonPackage.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockAddonPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockAddonPackage.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockAddonPackage.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockBrokenPackage.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockBrokenPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockBrokenPackage.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockBrokenPackage.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockEmptyPackage.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockEmptyPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockEmptyPackage.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockEmptyPackage.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockExtraPackage.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockExtraPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockExtraPackage.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockExtraPackage.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockPlatformPackage.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockPlatformPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockPlatformPackage.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockPlatformPackage.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockPlatformToolPackage.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockPlatformToolPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockPlatformToolPackage.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockPlatformToolPackage.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockSourcePackage.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockSourcePackage.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockSourcePackage.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockSourcePackage.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockSystemImagePackage.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockSystemImagePackage.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockSystemImagePackage.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockSystemImagePackage.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockToolPackage.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockToolPackage.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/MockToolPackage.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/MockToolPackage.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/PackageTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/PackageTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/PackageTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/PackageTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/PlatformPackageTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/PlatformPackageTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/PlatformPackageTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/PlatformPackageTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/SourcePackageTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/SourcePackageTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/SourcePackageTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/SourcePackageTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/SystemImagePackageTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/SystemImagePackageTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/packages/SystemImagePackageTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/packages/SystemImagePackageTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkAddonSourceTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/sources/SdkAddonSourceTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkAddonSourceTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/sources/SdkAddonSourceTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkRepoSourceTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/sources/SdkRepoSourceTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkRepoSourceTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/sources/SdkRepoSourceTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkSourcePropertiesTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/sources/SdkSourcePropertiesTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkSourcePropertiesTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/sources/SdkSourcePropertiesTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkSysImgSourceTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/sources/SdkSysImgSourceTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/sources/SdkSysImgSourceTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/internal/repository/sources/SdkSysImgSourceTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/io/MockFileOp.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/io/MockFileOp.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/io/MockFileOp.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/io/MockFileOp.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/io/MockFileOpTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/io/MockFileOpTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/io/MockFileOpTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/io/MockFileOpTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/mock/MockLog.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/mock/MockLog.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/CaptureErrorHandler.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/repository/CaptureErrorHandler.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/CaptureErrorHandler.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/repository/CaptureErrorHandler.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/ValidateAddonXmlTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/repository/ValidateAddonXmlTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/ValidateAddonXmlTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/repository/ValidateAddonXmlTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/ValidateAddonsListXmlTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/repository/ValidateAddonsListXmlTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/ValidateAddonsListXmlTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/repository/ValidateAddonsListXmlTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/ValidateRepositoryXmlTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/repository/ValidateRepositoryXmlTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/ValidateRepositoryXmlTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/repository/ValidateRepositoryXmlTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/ValidateSysImgXmlTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/repository/ValidateSysImgXmlTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/ValidateSysImgXmlTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/repository/ValidateSysImgXmlTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/AndroidManifest-activityalias.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/AndroidManifest-activityalias.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/AndroidManifest-activityalias.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/AndroidManifest-activityalias.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/AndroidManifest-instrumentation.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/AndroidManifest-instrumentation.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/AndroidManifest-instrumentation.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/AndroidManifest-instrumentation.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/AndroidManifest-testapp.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/AndroidManifest-testapp.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/AndroidManifest-testapp.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/AndroidManifest-testapp.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/AndroidManifest-testapp2.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/AndroidManifest-testapp2.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/AndroidManifest-testapp2.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/AndroidManifest-testapp2.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addon_sample_1.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addon_sample_1.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addon_sample_1.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addon_sample_1.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addon_sample_2.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addon_sample_2.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addon_sample_2.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addon_sample_2.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addon_sample_3.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addon_sample_3.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addon_sample_3.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addon_sample_3.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addon_sample_4.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addon_sample_4.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addon_sample_4.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addon_sample_4.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addon_sample_5.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addon_sample_5.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addon_sample_5.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addon_sample_5.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addons_list_sample_1.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addons_list_sample_1.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addons_list_sample_1.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addons_list_sample_1.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addons_list_sample_2.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addons_list_sample_2.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/addons_list_sample_2.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/addons_list_sample_2.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_1.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_1.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_1.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_1.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_2.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_2.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_2.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_2.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_3.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_3.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_3.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_3.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_4.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_4.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_4.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_4.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_5.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_5.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_5.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_5.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_6.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_6.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_6.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_6.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_7.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_7.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/repository_sample_7.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/repository_sample_7.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/stats_sample_1.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/stats_sample_1.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/stats_sample_1.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/stats_sample_1.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/sys_img_sample_1.xml b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/sys_img_sample_1.xml similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/testdata/sys_img_sample_1.xml rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/testdata/sys_img_sample_1.xml diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/util/BSPatchTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/util/BSPatchTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/util/BSPatchTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/util/BSPatchTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/util/CommandLineParserTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/util/CommandLineParserTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/util/CommandLineParserTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/util/CommandLineParserTest.java diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/util/LineUtilTest.java b/sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/util/LineUtilTest.java similarity index 100% rename from sdkmanager/libs/sdklib/tests/src/com/android/sdklib/util/LineUtilTest.java rename to sdkmanager/libs/sdklib/src/test/java/com/android/sdklib/util/LineUtilTest.java diff --git a/sdkmanager/libs/sdklib/tests/Android.mk b/sdkmanager/libs/sdklib/tests/Android.mk deleted file mode 100644 index c758cdac5984b41c24f2a64752c2b2cffbba2c9f..0000000000000000000000000000000000000000 --- a/sdkmanager/libs/sdklib/tests/Android.mk +++ /dev/null @@ -1,28 +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_JAVA_RESOURCE_DIRS := src - -LOCAL_MODULE := sdklib-tests -LOCAL_MODULE_TAGS := optional - -LOCAL_JAVA_LIBRARIES := sdklib junit dvlib-tests - -include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/testutils/.classpath b/testutils/.classpath index 45f7edb0d8f4ef1774b9ce1bec0f09498b3c819d..313424171cfbf74357bd33aa52021901b8283f23 100644 --- a/testutils/.classpath +++ b/testutils/.classpath @@ -1,7 +1,6 @@ - - + diff --git a/testutils/Android.mk b/testutils/Android.mk index 2a1f6dc7ab0d8f561a3c0852b8baa768f8d48a62..42876f805f0439bcb3b110c40ad9e60dde72b40a 100644 --- a/testutils/Android.mk +++ b/testutils/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 @@ -34,5 +34,16 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_HOST_JAVA_LIBRARY) -# Build all sub-directories -include $(call all-makefiles-under,$(LOCAL_PATH)) +# Build tests + +include $(CLEAR_VARS) + +# Only compile source java files in this lib. +LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) + +LOCAL_MODULE := sdktestutils-tests +LOCAL_MODULE_TAGS := optional + +LOCAL_JAVA_LIBRARIES := common sdktestutils junit + +include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/testutils/build.gradle b/testutils/build.gradle index 8ffc129dd5bab5845cae4abc4b0722419dd3f97b..0726488b5a2388dd21024b5fccbe43d843df2ad0 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -4,20 +4,6 @@ dependencies { } sourceSets { - main { - java { - srcDir 'src' - } - resources { - srcDir 'resources' - } - } - test { - java { - srcDir 'tests/src' - } - resources { - srcDir 'tests/resources' - } - } + main.resources.srcDir 'src/main/java' + test.resources.srcDir 'src/test/java' } diff --git a/testutils/src/com/android/testutils/SdkTestCase.java b/testutils/src/main/java/com/android/testutils/SdkTestCase.java similarity index 100% rename from testutils/src/com/android/testutils/SdkTestCase.java rename to testutils/src/main/java/com/android/testutils/SdkTestCase.java diff --git a/testutils/src/test/.classpath b/testutils/src/test/.classpath new file mode 100644 index 0000000000000000000000000000000000000000..271183e216a3d124ca4eee753de0d877eecfc612 --- /dev/null +++ b/testutils/src/test/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/testutils/tests/.project b/testutils/src/test/.project similarity index 100% rename from testutils/tests/.project rename to testutils/src/test/.project diff --git a/testutils/tests/src/com/android/testutils/SdkTestCaseTest.java b/testutils/src/test/java/com/android/testutils/SdkTestCaseTest.java similarity index 100% rename from testutils/tests/src/com/android/testutils/SdkTestCaseTest.java rename to testutils/src/test/java/com/android/testutils/SdkTestCaseTest.java diff --git a/testutils/tests/.classpath b/testutils/tests/.classpath deleted file mode 100644 index 0ac1351a921de2ebcce08a4bfa82cfdfaae16353..0000000000000000000000000000000000000000 --- a/testutils/tests/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/testutils/tests/Android.mk b/testutils/tests/Android.mk deleted file mode 100644 index e203ab487170fe42b2aee872972db6cc91970667..0000000000000000000000000000000000000000 --- a/testutils/tests/Android.mk +++ /dev/null @@ -1,27 +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) - -# Only compile source java files in this lib. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_MODULE := sdktestutils-tests -LOCAL_MODULE_TAGS := optional - -LOCAL_JAVA_LIBRARIES := common sdktestutils junit - -include $(BUILD_HOST_JAVA_LIBRARY)