| commit | bec11d94d50922dc80a5fdd1ce9c5c63257ddf0b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 02 20:19:24 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 20:19:24 2021 +0000 |
| tree | 3f13b493aeefc0e1df95338e5df13475f34ed92a | |
| parent | 89fbd4161792851a9537502d843f93e164580bb2 [diff] | |
| parent | 512857e29a27eb8a3fa268b3452c9abd096433e0 [diff] |
Merge "Add modules-utils-os to service-connectivity" am: 512857e29a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I22df4afec8f8b5024d099966c0ca0f78b55ff08a
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