Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31d87a9b authored by Rahul Sabnis's avatar Rahul Sabnis
Browse files

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
parent e03d99fa

tests/telephonytests/jarjar-rules-tests.txt

+0 −6
Original line number Diff line number Diff line
@@ -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