Free net.cts from cts.stub.
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
diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk
index 1fd9ba0..bf51890 100644
--- a/tests/cts/net/Android.mk
+++ b/tests/cts/net/Android.mk
@@ -23,12 +23,12 @@
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