Merge "Add modules-utils-os to service-connectivity"

2021-03-02 08:59:35 +00:00
parent a103c450bc 96a931b5b2
commit 6da87e0692
2 changed files with 3 additions and 1 deletions
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -63,6 +63,7 @@ java_library {
        "unsupportedappusage",
    ],
    static_libs: [
+        "modules-utils-os",
        "net-utils-device-common",
        "net-utils-framework-common",
        "netd-client",
--- a/service/jarjar-rules.txt
+++ b/service/jarjar-rules.txt
@@ -1 +1,2 @@
-rule com.android.net.module.util.** com.android.connectivity.util.@1
+rule com.android.net.module.util.** com.android.connectivity.net-utils.@1
+rule com.android.modules.utils.** com.android.connectivity.modules-utils.@1