Loading tests/telephonytests/jarjar-rules-tests.txt +6 −0 Original line number Original line Diff line number Diff line Loading @@ -4,3 +4,9 @@ # by services-net and one by telephony-common), similarly to what happens on a # 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. # real device, except that in the test they have different package names. rule android.net.NetworkFactory* android.net.services.NetworkFactory@1 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 Loading
tests/telephonytests/jarjar-rules-tests.txt +6 −0 Original line number Original line Diff line number Diff line Loading @@ -4,3 +4,9 @@ # by services-net and one by telephony-common), similarly to what happens on a # 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. # real device, except that in the test they have different package names. rule android.net.NetworkFactory* android.net.services.NetworkFactory@1 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
