LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Free net.cts from cts.stub.

Browse Source 
Explicitly include CtsTestServer in Android.mk to eliminate the
dependency to cts.stub. This allows net.cts to instrument itself,
and it also allows network-specific JNI code to be added in the
same package.

Change-Id: I624f87e0112619c5b97f2c3589933f666665fa8e
This commit is contained in:
Chia-chi Yeh
2012-02-28 14:05:12 -08:00
parent a36a66a542
commit 4231515a1b
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cts/net/Android.mk
View File

@@ -23,12 +23,12 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
# include CtsTestServer as a temporary hack to free net.cts from cts.stub.
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
../../src/android/webkit/cts/CtsTestServer.java
LOCAL_PACKAGE_NAME := CtsNetTestCases
LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current

12
tests/cts/net/AndroidManifest.xml
View File

@@ -18,12 +18,20 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.cts.net">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application>
<uses-library android:name="android.test.runner" />
</application>
<instrumentation android:name="android.test.InstrumentationCtsTestRunner"
android:targetPackage="com.android.cts.stub"
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.android.cts.net"
android:label="CTS tests of android.net"/>
</manifest>