From 97c2b8beba5ac3075c814862cd925ac2c69479ee Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Thu, 30 May 2013 14:22:42 -0700
Subject: [PATCH] Generalize support library tests.

Change-Id: I21c828268e7a7e4ca6be5dae7a5ab85789a9a7b5
---
 {v4/tests => tests}/Android.mk                                | 2 +-
 {v4/tests => tests}/AndroidManifest.xml                       | 4 ++--
 .../java/android/support/v4/content/FileProviderTest.java     | 0
 {v4/tests => tests}/res/xml/paths.xml                         | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {v4/tests => tests}/Android.mk (85%)
 rename {v4/tests => tests}/AndroidManifest.xml (91%)
 rename {v4/tests => tests}/java/android/support/v4/content/FileProviderTest.java (100%)
 rename {v4/tests => tests}/res/xml/paths.xml (100%)

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 f94db83a929b..b14ca93253b8 100644
--- a/v4/tests/Android.mk
+++ b/tests/Android.mk
@@ -7,6 +7,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, java)
 
 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 f91afc5d670f..db827937c8e3 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