diff options
| author | Xiao Ma <xiaom@google.com> | 2021-02-28 12:04:22 +0000 |
|---|---|---|
| committer | Xiao Ma <xiaom@google.com> | 2021-02-28 12:04:22 +0000 |
| commit | 17cbb1659f777fee273f6bd31d23de80582d62a8 (patch) | |
| tree | 6323ae0ad3158137e44bfa2fb233e3d5a3e8402d | |
| parent | 31d87a9bb317fc9cda4f70b81b8d0623bf930fdd (diff) | |
| download | telephony-17cbb1659f777fee273f6bd31d23de80582d62a8.tar.gz | |
Revert "Revert "Rename net-utils-framework-common in FrameworksTelephony...""
This reverts commit 31d87a9bb317fc9cda4f70b81b8d0623bf930fdd.
Reason for revert: Roll forward the previous change and try to merge it one by one instead of using the topic, which should avoid the build broken on the sc-dev branch due to the deferred auto-merge process.
Bug: 168868607
Change-Id: I3563e5e0fdadee07b5bf370e9646754ed3afc278
Test: atest FrameworksTelephonyTests
| -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 |