diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-02 08:59:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-02 08:59:35 +0000 |
| commit | 588f3e84ab397f9d3430c768060b5af0499dd350 (patch) | |
| tree | 974678354087489e3bf3f8941e2359bc87b52d6e | |
| parent | e9baf825f1ae40c4f3b28943161a3547ee5490b8 (diff) | |
| parent | 37735055f22c0cfea399e1f93add283861e0c653 (diff) | |
| download | base-588f3e84ab397f9d3430c768060b5af0499dd350.tar.gz | |
Merge "Add modules-utils-os to service-connectivity"
| -rw-r--r-- | packages/Connectivity/service/Android.bp | 1 | ||||
| -rw-r--r-- | packages/Connectivity/service/jarjar-rules.txt | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/Connectivity/service/Android.bp b/packages/Connectivity/service/Android.bp index f20b89fb842c..e65b7b423bdc 100644 --- a/packages/Connectivity/service/Android.bp +++ b/packages/Connectivity/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", diff --git a/packages/Connectivity/service/jarjar-rules.txt b/packages/Connectivity/service/jarjar-rules.txt index ef53ebb43c40..d8205bf780fd 100644 --- a/packages/Connectivity/service/jarjar-rules.txt +++ b/packages/Connectivity/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 |