Allow jarjar com.android.server*
Jarjar com.android.server* and adjust the test by jarjar FrameworksNetTestsLib to make sure the test cases still can access package sope fields. Don't auto-jarjar non-connectivity module tests in FrameworksNetTests because some non-connectivity module test cases rely on service.core and service.net. The reason why not auto-jarjar whole ConnectivityCoverageTests because tethering doesn't adopt auto-jarjar-gen yet. The coverage test must jarjar the same as module so that test coverage can calculate correctly. Remove com.android.server* from proguard becasue it already be covered by android.net* after jarjar'ed. Move MetricsTestUtil to non connectivity module test group because it only be used for IpConnectivityEventBuilderTest which is non connectivity module test. Only jarjar the util without jarjar the caller make the test failure. Bug: 248001529 Test: atest ConnectivityCoverageTests FrameworksNetTests Change-Id: I8439341ef4c03f29697fdf34557ea8ef2825d691
Showing
- service-t/jni/com_android_server_net_NetworkStatsFactory.cpp 2 additions, 1 deletionservice-t/jni/com_android_server_net_NetworkStatsFactory.cpp
- service-t/jni/com_android_server_net_NetworkStatsService.cpp 3 additions, 2 deletionsservice-t/jni/com_android_server_net_NetworkStatsService.cpp
- service/jarjar-excludes.txt 0 additions, 6 deletionsservice/jarjar-excludes.txt
- service/jni/com_android_server_BpfNetMaps.cpp 1 addition, 1 deletionservice/jni/com_android_server_BpfNetMaps.cpp
- service/jni/com_android_server_TestNetworkService.cpp 3 additions, 2 deletionsservice/jni/com_android_server_TestNetworkService.cpp
- service/jni/com_android_server_connectivity_ClatCoordinator.cpp 3 additions, 2 deletions...e/jni/com_android_server_connectivity_ClatCoordinator.cpp
- service/proguard.flags 1 addition, 1 deletionservice/proguard.flags
- tests/common/Android.bp 1 addition, 1 deletiontests/common/Android.bp
- tests/unit/Android.bp 33 additions, 1 deletiontests/unit/Android.bp
- tests/unit/AndroidManifest.xml 1 addition, 1 deletiontests/unit/AndroidManifest.xml
- tests/unit/jarjar-excludes.txt 27 additions, 0 deletionstests/unit/jarjar-excludes.txt
Loading
Please register or sign in to comment