diff options
| author | Xiao Ma <xiaom@google.com> | 2021-03-01 03:41:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-01 03:41:19 +0000 |
| commit | 71193dd5ed2d75115a7d85289d9bf07a5955c380 (patch) | |
| tree | fc331cef391e06cc5443b9949b29e5d12d4e631f | |
| parent | a539d5cc5aaef91e57a12a3f316c2821f68ade98 (diff) | |
| parent | c82b7b2656b79f589b5198ceca8f8c4be5576e03 (diff) | |
| download | telephony-71193dd5ed2d75115a7d85289d9bf07a5955c380.tar.gz | |
Merge "Revert "Revert "Rename net-utils-framework-common in FrameworksTelephony...""" am: c82b7b2656
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1611873
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6412cbb26203ab021e84ee965131788d629ffa6f
| -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 |