summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2020-06-18 15:02:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-18 15:02:44 +0000
commitf978cfbc93d6cead109327220d1adce7bbc0e82e (patch)
tree7f59d74ca59ac95f2e4abb33a12b7cc617db2e3e
parent628ae8fc41aa1428fe4f99ea0b0491877fa30d27 (diff)
parent83a1744ce7a614d61756e9d1dbbbbe8fb7decb00 (diff)
Merge "Jarjar frameworks/libs/net in NetworkStack module" into rvc-dev am: def2536afa am: 83a1744ce7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11867583 Change-Id: I363cef09ba32fc4cdd737b2e17ee1723a30a0031
-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 7346b1a..7953f93 100644
--- a/jarjar-rules-shared.txt
+++ b/jarjar-rules-shared.txt
@@ -1,3 +1,6 @@
+# Classes from net-utils-framework-common
+rule com.android.net.module.util.** com.android.networkstack.util.@1
+
rule com.android.internal.util.** android.net.networkstack.util.@1
rule android.net.shared.Inet4AddressUtils* android.net.networkstack.shared.Inet4AddressUtils@1