diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-05 16:30:52 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-05 16:30:52 +0000 |
| commit | db664845cd5691b7f566f79d0846155676587957 (patch) | |
| tree | c1f6496d0d37859eeed56e0b045913f9eb04a10c | |
| parent | 8e480c6ab463171e3573a900ffd6e683d8aa8cc6 (diff) | |
| parent | 1f8dd5a79f65df9e24a788f74a3afe74ade7e9d5 (diff) | |
| download | telephony-android11-mainline-media-release.tar.gz | |
Snap for 7259092 from 1f8dd5a79f65df9e24a788f74a3afe74ade7e9d5 to mainline-media-releaseandroid-mainline-11.0.0_r39android11-mainline-media-release
Change-Id: I90c8adfba1e413d88e7360dd4c0e2c6587fad8a8
| -rw-r--r-- | tests/telephonytests/jarjar-rules-tests.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/telephonytests/jarjar-rules-tests.txt b/tests/telephonytests/jarjar-rules-tests.txt index 91b5b322a7..7f7246956a 100644 --- a/tests/telephonytests/jarjar-rules-tests.txt +++ b/tests/telephonytests/jarjar-rules-tests.txt @@ -4,3 +4,9 @@ # by services-net and one by telephony-common), similarly to what happens on a # real device, except that in the test they have different package names. rule android.net.NetworkFactory* android.net.services.NetworkFactory@1 + +# Telephony-common has already included net-utils-framework-common lib and jarjars +# the package name. FrameworksTelephonyTests also includes net-utils-framework-common +# via net-tests-utils and tries to jarjar it again. Rename the package name with +# differnt prefix in the test jarjar rule to avoid duplicate jar entries. +rule com.android.net.module.util.** com.android.internal.telephony.util.test.@1 |