Generalize support library tests.

Change-Id: I21c828268e7a7e4ca6be5dae7a5ab85789a9a7b5
zxyjyh · May 30, 2013 · 97c2b8b · 97c2b8b
1 parent be5d626
commit 97c2b8b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/v4/tests/Android.mk → tests/Android.mk b/v4/tests/Android.mk → 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 → tests/AndroidManifest.xml b/v4/tests/AndroidManifest.xml → 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/.../support/v4/content/FileProviderTest.java → .../support/v4/content/FileProviderTest.java b/.../support/v4/content/FileProviderTest.java → .../support/v4/content/FileProviderTest.java
diff --git a/v4/tests/res/xml/paths.xml → tests/res/xml/paths.xml b/v4/tests/res/xml/paths.xml → tests/res/xml/paths.xml