diff options
| author | Rahul Sabnis <rahulsabnis@google.com> | 2021-02-26 20:02:44 +0000 |
|---|---|---|
| committer | Rahul Sabnis <rahulsabnis@google.com> | 2021-02-26 20:02:44 +0000 |
| commit | 31d87a9bb317fc9cda4f70b81b8d0623bf930fdd (patch) | |
| tree | e077d39ca03ecf6bac298f29889138a74a065f59 | |
| parent | e03d99fa6d850f8153bb3a6bf6a4b779275b7cd1 (diff) | |
| download | telephony-31d87a9bb317fc9cda4f70b81b8d0623bf930fdd.tar.gz | |
Revert "Rename net-utils-framework-common in FrameworksTelephony..."
Revert submission 1579863-ipv6_utils
Reason for revert: Build breakage
Bug: 181339273
Reverted Changes:
I0d3b133e5:Rename net-utils-framework-common in FrameworksTel...
I1c050ae42:Add utilities to create IPv6 ICMP messages.
Change-Id: I6b955b5b1d09062f873db243416de4f762db62fe
| -rw-r--r-- | tests/telephonytests/jarjar-rules-tests.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/telephonytests/jarjar-rules-tests.txt b/tests/telephonytests/jarjar-rules-tests.txt index 7f7246956a..91b5b322a7 100644 --- a/tests/telephonytests/jarjar-rules-tests.txt +++ b/tests/telephonytests/jarjar-rules-tests.txt @@ -4,9 +4,3 @@ # 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 |