diff options
| -rw-r--r-- | jarjar-rules-shared.txt | 2 | ||||
| -rw-r--r-- | tests/integration/Android.bp | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/jarjar-rules-shared.txt b/jarjar-rules-shared.txt index 438fc61..048c976 100644 --- a/jarjar-rules-shared.txt +++ b/jarjar-rules-shared.txt @@ -11,4 +11,4 @@ rule com.android.net.module.util.** com.android.networkstack.util.@1 # TODO: move DhcpResults into services.net and delete from here rule android.net.DhcpResultsParcelable* @0 rule android.net.DhcpResults* android.net.networkstack.DhcpResults@1 -rule android.net.LocalLog* android.net.networkstack.LocalLog@1 +rule android.util.LocalLog* android.net.networkstack.util.LocalLog@1 diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp index 1a985a9..af63f0e 100644 --- a/tests/integration/Android.bp +++ b/tests/integration/Android.bp @@ -82,6 +82,18 @@ android_test { test_suites: ["device-tests"], } +// The static lib needs to be jarjared by each module so they do not conflict with each other +// (e.g. wifi, system server, network stack need to use different package names when including it). +// Apply NetworkStack jarjar rules to the tests as well so classes in NetworkStaticLibTests have the +// same package names as in module code. +android_library { + name: "NetworkStackStaticLibTestsLib", + platform_apis: true, + min_sdk_version: "29", + jarjar_rules: ":NetworkStackJarJarRules", + static_libs: ["NetworkStaticLibTestsLib"], +} + // Special version of the network stack tests that includes all tests necessary for code coverage // purposes. This is currently the union of NetworkStackTests and NetworkStackIntegrationTests. android_test { @@ -95,7 +107,7 @@ android_test { static_libs: [ "NetworkStackTestsLib", "NetworkStackIntegrationTestsLib", - "NetworkStaticLibTestsLib", + "NetworkStackStaticLibTestsLib", ], compile_multilib: "both", manifest: "AndroidManifest_coverage.xml", |