| commit | 786edfae7ac791659cd7f0aea69e5c1697dbe859 | [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 | 298314b299bf2124d5121b90d28015672514f254 | |
| parent | eb0cc323ce88e6adae3b1969ba1a2dfe9511d9a6 [diff] | |
| parent | a941d4622729f1418095133482dd6ea151c99e5e [diff] |
Merge "Add modules-utils-os to service-connectivity" am: 6da87e0692 am: a941d46227 am: 939790b120 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