diff options
| author | Xiao Ma <xiaom@google.com> | 2021-03-01 09:13:34 +0000 |
|---|---|---|
| committer | Xiao Ma <xiaom@google.com> | 2021-03-26 06:59:43 +0000 |
| commit | 1f8dd5a79f65df9e24a788f74a3afe74ade7e9d5 (patch) | |
| tree | c1f6496d0d37859eeed56e0b045913f9eb04a10c /tests/telephonytests | |
| parent | 6d526df1d27a0b8adf8039ff3d56331d2c0f9d1d (diff) | |
| download | telephony-1f8dd5a79f65df9e24a788f74a3afe74ade7e9d5.tar.gz | |
"Revert "Revert "Rename net-utils-framework-common in FrameworksTelephony..."""
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1611873
Merged-In: Iae09e71533b2a4da837caeedd73a2b63885e07bb
(cherry picked from commit d42577f3f12c7814b1b13d1ace30be7e9f0e4a96)
Change-Id: I5aef0f24a060101030f8b690cf5558b443806471
Diffstat (limited to 'tests/telephonytests')
| -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 |