summaryrefslogtreecommitdiff
path: root/jarjar-rules-shared.txt
diff options
context:
space:
mode:
author Remi NGUYEN VAN <reminv@google.com> 2020-06-12 09:59:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-06-12 09:59:24 +0000
commitb28d99832fc57a3fa8fa7b4636617d092acaea0f (patch)
tree237ede633784d96f3d7ddbda7387ae58aaaf0d49 /jarjar-rules-shared.txt
parentd3e02f06ef512adbb11290610c79cdaf984ccbad (diff)
parent80285144583a6e5475ef3e1b32de6550515942e9 (diff)
Merge "Jarjar frameworks/libs/net in telephony module" am: 4bae9375e9 am: f0e6b9220b am: 267d19bd3a am: 2196776540 am: 8028514458
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1234348 Change-Id: I3594eb1c6ab961d5feb93993f9c2cb249096858e
Diffstat (limited to 'jarjar-rules-shared.txt')
-rw-r--r--jarjar-rules-shared.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/jarjar-rules-shared.txt b/jarjar-rules-shared.txt
index 6346bb7b64..6b43e6985f 100644
--- a/jarjar-rules-shared.txt
+++ b/jarjar-rules-shared.txt
@@ -20,3 +20,6 @@ rule com.android.internal.util.State* com.android.internal.telephony.State@1
rule com.android.internal.util.StateMachine* com.android.internal.telephony.StateMachine@1
rule com.android.internal.util.UserIcons* com.android.internal.telephony.UserIcons@1
rule com.google.i18n.phonenumbers.** com.android.internal.telephony.phonenumbers.@1
+
+# Module library in frameworks/libs/net
+rule com.android.net.module.util.** com.android.internal.telephony.util.@1