| commit | 24705679064d2102108236e3af4f6a97e7b65137 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 02 21:09:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 21:09:13 2021 +0000 |
| tree | 200021ae302de1750d9678d2b46a722572a85c4d | |
| parent | c4262b0bd3a41b636ea27268ab8d72522939efb1 [diff] | |
| parent | 0de430ef26560735e12d65b4ddc657aa793e6181 [diff] |
Merge "Add modules-utils-os to service-connectivity" am: d55697b5e2 am: dec716d6d3 am: 0de430ef26 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7bf0262dc4542e8cdf07ebf19a3367fa9b57f385
diff --git a/service/Android.bp b/service/Android.bp index f20b89f..e65b7b4 100644 --- a/service/Android.bp +++ b/service/Android.bp
@@ -63,6 +63,7 @@ "unsupportedappusage", ], static_libs: [ + "modules-utils-os", "net-utils-device-common", "net-utils-framework-common", "netd-client",
diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt index ef53ebb..d8205bf 100644 --- a/service/jarjar-rules.txt +++ b/service/jarjar-rules.txt
@@ -1 +1,2 @@ -rule com.android.net.module.util.** com.android.connectivity.util.@1 \ No newline at end of file +rule com.android.net.module.util.** com.android.connectivity.net-utils.@1 +rule com.android.modules.utils.** com.android.connectivity.modules-utils.@1 \ No newline at end of file