diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-07-01 04:48:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 04:48:48 +0000 |
| commit | b8059b4e9103e9902b1496052c140e317c801b31 (patch) | |
| tree | ba6e93b08c601e64223596a158c2f719787faa32 | |
| parent | 80b50a0304135d8264351f83b340b27a14019d03 (diff) | |
| parent | 35aa6f2e1879ebc7149e6d06f46976166e0667c2 (diff) | |
Apply jarjar rules to NetworkStaticLibTests am: 35aa6f2e18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/12034943
Change-Id: I8de9d4ad72f5e9305d96ee4d62e0f4028e1324f0
| -rw-r--r-- | tests/integration/Android.bp | 14 |
1 files changed, 13 insertions, 1 deletions
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", |