am 0c61fe0a: am 97c2b8be: Generalize support library tests.
* commit '0c61fe0a51a718a9a27b496338b96b03d7cd9f94':
Generalize support library tests.
diff --git a/v4/tests/Android.mk b/tests/Android.mk
similarity index 85%
rename from v4/tests/Android.mk
rename to tests/Android.mk
index f94db83..b14ca93 100644
--- a/v4/tests/Android.mk
+++ b/tests/Android.mk
@@ -7,6 +7,6 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_PACKAGE_NAME := AndroidSupport4Tests
+LOCAL_PACKAGE_NAME := AndroidSupportTests
include $(BUILD_PACKAGE)
diff --git a/v4/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
similarity index 91%
rename from v4/tests/AndroidManifest.xml
rename to tests/AndroidManifest.xml
index f91afc5..db82793 100644
--- a/v4/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -15,7 +15,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.support.v4.content.tests">
+ package="android.support.tests">
<application>
<uses-library android:name="android.test.runner" />
@@ -33,6 +33,6 @@
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="android.support.v4.content.tests" />
+ android:targetPackage="android.support.tests" />
</manifest>
diff --git a/v4/tests/java/android/support/v4/content/FileProviderTest.java b/tests/java/android/support/v4/content/FileProviderTest.java
similarity index 100%
rename from v4/tests/java/android/support/v4/content/FileProviderTest.java
rename to tests/java/android/support/v4/content/FileProviderTest.java
diff --git a/v4/tests/res/xml/paths.xml b/tests/res/xml/paths.xml
similarity index 100%
rename from v4/tests/res/xml/paths.xml
rename to tests/res/xml/paths.xml
