Static Libs for Popular CTS Stub Components
com.android.cts.stub is growing very large. Split apart some of
the popular components into separate static libraries. This
should allow packages to depend on the components they need
rather than all of cts.stub.
Current code at the moment doesn't have to be changed, because
I have CtsTestStubs depending on these new shared libraries.
However, change the net package to depend on the ctstestserver
static library as a proof of concept rather than including
its source directly.
Change-Id: I32c54eab3ddfb1d4391d6ffc347fbc9cb2fe97f9
diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk
index c139d1c..3e48cd2 100644
--- a/tests/cts/net/Android.mk
+++ b/tests/cts/net/Android.mk
@@ -24,11 +24,12 @@
LOCAL_JAVA_LIBRARIES := android.test.runner
# 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_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsNetTestCases
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestserver
+
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current