diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-07-01 05:01:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 05:01:31 +0000 |
| commit | 81fc3b61b8b0a4895ddc4385c2b3269a92fbb525 (patch) | |
| tree | f52e95379301cda6e933cf9d8be71da9bf112af3 | |
| parent | d94e10da388bbfb9c987558a495223ddbad8e23d (diff) | |
| parent | b8059b4e9103e9902b1496052c140e317c801b31 (diff) | |
Apply jarjar rules to NetworkStaticLibTests am: 35aa6f2e18 am: b8059b4e91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/12034943
Change-Id: Ia8f2c8f3ab701f8a5d18e439c2658b7e899de1c5
| -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", |