Build JankTestHelper with Gradle
Change-Id: If4a6cb60c5871f21bacb1a9ca6a1b8aa6ced54a7
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index fc8806f..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2014 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_LIBRARIES := android-support-test
-LOCAL_MODULE := janktesthelper
-LOCAL_SDK_VERSION := current
-LOCAL_JAVACFLAGS := -source 6 -target 6
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..f8bc770
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,23 @@
+apply plugin: 'android-library'
+
+group = 'com.android.support.test.janktesthelper'
+version = '0.1'
+
+// Android Library configuration
+android {
+ defaultConfig {
+ minSdkVersion 21
+ }
+}
+
+configurations {
+ doclava
+}
+
+dependencies {
+ doclava project(':doclava')
+ compile project(':testing-support-lib')
+}
+
+apply from: "../testing/publish.gradle"
+
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..a86de1f
--- /dev/null
+++ b/src/main/AndroidManifest.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.support.test.janktesthelper.v21">
+ <application />
+</manifest>
diff --git a/src/android/support/test/jank/GfxMonitor.java b/src/main/java/android/support/test/jank/GfxMonitor.java
similarity index 100%
rename from src/android/support/test/jank/GfxMonitor.java
rename to src/main/java/android/support/test/jank/GfxMonitor.java
diff --git a/src/android/support/test/jank/JankTest.java b/src/main/java/android/support/test/jank/JankTest.java
similarity index 100%
rename from src/android/support/test/jank/JankTest.java
rename to src/main/java/android/support/test/jank/JankTest.java
diff --git a/src/android/support/test/jank/JankTestBase.java b/src/main/java/android/support/test/jank/JankTestBase.java
similarity index 100%
rename from src/android/support/test/jank/JankTestBase.java
rename to src/main/java/android/support/test/jank/JankTestBase.java
diff --git a/src/android/support/test/jank/WindowAnimationFrameStatsMonitor.java b/src/main/java/android/support/test/jank/WindowAnimationFrameStatsMonitor.java
similarity index 100%
rename from src/android/support/test/jank/WindowAnimationFrameStatsMonitor.java
rename to src/main/java/android/support/test/jank/WindowAnimationFrameStatsMonitor.java
diff --git a/src/android/support/test/jank/WindowContentFrameStatsMonitor.java b/src/main/java/android/support/test/jank/WindowContentFrameStatsMonitor.java
similarity index 100%
rename from src/android/support/test/jank/WindowContentFrameStatsMonitor.java
rename to src/main/java/android/support/test/jank/WindowContentFrameStatsMonitor.java
diff --git a/src/android/support/test/jank/internal/FrameStatsMonitorBase.java b/src/main/java/android/support/test/jank/internal/FrameStatsMonitorBase.java
similarity index 100%
rename from src/android/support/test/jank/internal/FrameStatsMonitorBase.java
rename to src/main/java/android/support/test/jank/internal/FrameStatsMonitorBase.java
diff --git a/src/android/support/test/jank/internal/GfxMonitorImpl.java b/src/main/java/android/support/test/jank/internal/GfxMonitorImpl.java
similarity index 100%
rename from src/android/support/test/jank/internal/GfxMonitorImpl.java
rename to src/main/java/android/support/test/jank/internal/GfxMonitorImpl.java
diff --git a/src/android/support/test/jank/internal/JankMonitor.java b/src/main/java/android/support/test/jank/internal/JankMonitor.java
similarity index 100%
rename from src/android/support/test/jank/internal/JankMonitor.java
rename to src/main/java/android/support/test/jank/internal/JankMonitor.java
diff --git a/src/android/support/test/jank/internal/JankMonitorFactory.java b/src/main/java/android/support/test/jank/internal/JankMonitorFactory.java
similarity index 100%
rename from src/android/support/test/jank/internal/JankMonitorFactory.java
rename to src/main/java/android/support/test/jank/internal/JankMonitorFactory.java
diff --git a/src/android/support/test/jank/internal/MetricsHelper.java b/src/main/java/android/support/test/jank/internal/MetricsHelper.java
similarity index 100%
rename from src/android/support/test/jank/internal/MetricsHelper.java
rename to src/main/java/android/support/test/jank/internal/MetricsHelper.java
diff --git a/src/android/support/test/jank/internal/WindowAnimationFrameMonitorImpl.java b/src/main/java/android/support/test/jank/internal/WindowAnimationFrameMonitorImpl.java
similarity index 100%
rename from src/android/support/test/jank/internal/WindowAnimationFrameMonitorImpl.java
rename to src/main/java/android/support/test/jank/internal/WindowAnimationFrameMonitorImpl.java
diff --git a/src/android/support/test/jank/internal/WindowContentFrameMonitorImpl.java b/src/main/java/android/support/test/jank/internal/WindowContentFrameMonitorImpl.java
similarity index 100%
rename from src/android/support/test/jank/internal/WindowContentFrameMonitorImpl.java
rename to src/main/java/android/support/test/jank/internal/WindowContentFrameMonitorImpl.java
