57 files changed, 16 insertions, 50 deletions
diff --git a/layoutlib_api/.classpath b/layoutlib_api/.classpath
index b4b5b96..d7c9d12 100644
--- a/layoutlib_api/.classpath
+++ b/layoutlib_api/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="tests/src"/>
+	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/misc/common/kxml2/kxml2-2.3.0.jar" sourcepath="/ANDROID_SRC/dalvik/libcore/xml/src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
diff --git a/layoutlib_api/Android.mk b/layoutlib_api/Android.mk
index 30ce41b..32ee53f 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 82a2af4..3f92474 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
index ddcdbd5..ddcdbd5 100644
--- 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
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
index 530e3d5..530e3d5 100644
--- 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
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
index a19b8d5..a19b8d5 100644
--- 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
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
index 5ad438d..5ad438d 100644
--- 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
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
index 2a93f15..2a93f15 100644
--- 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
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
index a8f269f..a8f269f 100644
--- 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
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
index 5add715..5add715 100644
--- 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
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
index b566ad3..b566ad3 100644
--- 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
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
index 89f1424..89f1424 100644
--- 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
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
index 81a2320..81a2320 100644
--- 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
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
index 7681243..7681243 100644
--- 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
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
index 9c0e97b..9c0e97b 100644
--- 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
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
index a88b0d3..a88b0d3 100644
--- 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
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
index df29537..df29537 100644
--- 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
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
index ce5d21d..ce5d21d 100644
--- 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
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
index 2e53f14..2e53f14 100644
--- 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
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
index c362224..c362224 100644
--- 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
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
index 96caa6a..96caa6a 100644
--- 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
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
index f22f51e..f22f51e 100644
--- 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
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
index dceb7c5..dceb7c5 100644
--- 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
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
index a739e79..a739e79 100644
--- 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
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
index 709207e..709207e 100644
--- 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
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
index 7fdfd6a..7fdfd6a 100644
--- 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
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
index d859e95..d859e95 100644
--- 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
diff --git a/layoutlib_api/src/com/android/layoutlib/api/IDensityBasedResourceValue.java b/layoutlib_api/src/main/java/com/android/layoutlib/api/IDensityBasedResourceValue.java
index 25d9bfb..25d9bfb 100644
--- a/layoutlib_api/src/com/android/layoutlib/api/IDensityBasedResourceValue.java
+++ b/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
index f849cdd..f849cdd 100644
--- a/layoutlib_api/src/com/android/layoutlib/api/ILayoutBridge.java
+++ b/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
index 38a22b8..38a22b8 100644
--- a/layoutlib_api/src/com/android/layoutlib/api/ILayoutLog.java
+++ b/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
index 6aeaf9f..6aeaf9f 100644
--- a/layoutlib_api/src/com/android/layoutlib/api/ILayoutResult.java
+++ b/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
index 65e2a87..65e2a87 100644
--- a/layoutlib_api/src/com/android/layoutlib/api/IProjectCallback.java
+++ b/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
index 9a00801..9a00801 100644
--- a/layoutlib_api/src/com/android/layoutlib/api/IResourceValue.java
+++ b/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
index 21036ca..21036ca 100644
--- a/layoutlib_api/src/com/android/layoutlib/api/IStyleResourceValue.java
+++ b/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
index e0a98a6..e0a98a6 100644
--- a/layoutlib_api/src/com/android/layoutlib/api/IXmlPullParser.java
+++ b/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
index 1f3fb52..1f3fb52 100644
--- a/layoutlib_api/src/com/android/resources/Density.java
+++ b/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
index 61a6d85..61a6d85 100644
--- a/layoutlib_api/src/com/android/resources/FolderTypeRelationship.java
+++ b/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
index d6bc80a..d6bc80a 100644
--- a/layoutlib_api/src/com/android/resources/Keyboard.java
+++ b/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
index 2eb7e00..2eb7e00 100644
--- a/layoutlib_api/src/com/android/resources/KeyboardState.java
+++ b/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
index fbc386d..fbc386d 100644
--- a/layoutlib_api/src/com/android/resources/LayoutDirection.java
+++ b/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
index f857e5f..f857e5f 100644
--- a/layoutlib_api/src/com/android/resources/Navigation.java
+++ b/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
index 63b8fea..63b8fea 100644
--- a/layoutlib_api/src/com/android/resources/NavigationState.java
+++ b/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
index 8fe1dd9..8fe1dd9 100644
--- a/layoutlib_api/src/com/android/resources/NightMode.java
+++ b/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
index 748f88a..748f88a 100644
--- a/layoutlib_api/src/com/android/resources/ResourceConstants.java
+++ b/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
index 7f4e16a..7f4e16a 100644
--- a/layoutlib_api/src/com/android/resources/ResourceEnum.java
+++ b/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
index 65c1cb3..65c1cb3 100644
--- a/layoutlib_api/src/com/android/resources/ResourceFolderType.java
+++ b/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
index e9d4d53..e9d4d53 100644
--- a/layoutlib_api/src/com/android/resources/ResourceType.java
+++ b/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
index b18753d..b18753d 100644
--- a/layoutlib_api/src/com/android/resources/ScreenOrientation.java
+++ b/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
index bb575b0..bb575b0 100644
--- a/layoutlib_api/src/com/android/resources/ScreenRatio.java
+++ b/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
index 4def540..4def540 100644
--- a/layoutlib_api/src/com/android/resources/ScreenSize.java
+++ b/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
index 7eeeb08..7eeeb08 100644
--- a/layoutlib_api/src/com/android/resources/TouchScreen.java
+++ b/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
index d1ddbc8..d1ddbc8 100644
--- a/layoutlib_api/src/com/android/resources/UiMode.java
+++ b/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
index 7e797e0..7e797e0 100644
--- a/layoutlib_api/src/com/android/util/Pair.java
+++ b/layoutlib_api/src/main/java/com/android/util/Pair.java
diff --git a/layoutlib_api/tests/.classpath b/layoutlib_api/src/test/.classpath
index cda1977..7564f2f 100644
--- a/layoutlib_api/tests/.classpath
+++ b/layoutlib_api/src/test/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
diff --git a/layoutlib_api/tests/.project b/layoutlib_api/src/test/.project
index 9f550a3..9f550a3 100644
--- a/layoutlib_api/tests/.project
+++ b/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
index 809eae7..809eae7 100644
--- a/layoutlib_api/tests/src/com/android/resources/FolderTypeRelationShipTest.java
+++ b/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 10e75e8..0000000
--- 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)