Cleanup networkstack-client
- Use framework-annotations-lib instead of framework-annotations, to
avoid including annotation .class files in the output .jar
- Remove dependency on net-utils-framework-common, by moving
KeepalivePacketDataUtil.fromStableParcelable to its only user,
TcpKeepaliveController.
- Build against module_current to allow using
framework-annotations-lib without conflicts with annotation classes
in the system_current stubs. Have NetworkStack stubs link against
just the AIDL libraries (not networkstack-client), as the system_29
stubs cannot use a module_current library.
Test: atest NetworkStackTests ConnectivityCoverageTests
Change-Id: Ic07b7bdd1ef57d690644ce09d9d5a7851ef9763d
diff --git a/Android.bp b/Android.bp
index c40c3fb..9c4b8e3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -68,7 +68,7 @@
name: "NetworkStackShimsDefaults",
libs: [
"androidx.annotation_annotation",
- "networkstack-client",
+ "networkstack-aidl-latest",
],
static_libs : [
"modules-utils-build_system"