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

Commit 17cbb165 authored by Xiao Ma's avatar Xiao Ma
Browse files

Revert "Revert "Rename net-utils-framework-common in FrameworksTelephony..."" 

This reverts commit 31d87a9b.

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
parent 31d87a9b

tests/telephonytests/jarjar-rules-tests.txt

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