diff options
| author | 2021-03-15 08:42:02 +0000 | |
|---|---|---|
| committer | 2021-03-15 08:42:02 +0000 | |
| commit | ee705dfe0ceb59d46bde79915e8919bfba600647 (patch) | |
| tree | 439a06b72594fddb8145a8f8411ed41c75384e85 | |
| parent | 4ac52e881c70f1b6083133630bd04d6fc80c59ab (diff) | |
| parent | ed60cc949b26acd0a01aa22bd6feb60daeb82c5f (diff) | |
Merge "[CS15]Do not use hidden API of PlatformProperties" am: ed60cc949b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I623fd33e756f9ada6b73f716a30778fd6236f6ae
| -rw-r--r-- | packages/Connectivity/service/Android.bp | 3 | ||||
| -rw-r--r-- | packages/Connectivity/service/jarjar-rules.txt | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/Connectivity/service/Android.bp b/packages/Connectivity/service/Android.bp index 2fb9f72feab7..856f3b85333a 100644 --- a/packages/Connectivity/service/Android.bp +++ b/packages/Connectivity/service/Android.bp @@ -66,6 +66,7 @@ java_library { "net-utils-device-common", "net-utils-framework-common", "netd-client", + "PlatformProperties", ], apex_available: [ "//apex_available:platform", @@ -76,7 +77,7 @@ java_library { java_library { name: "service-connectivity", installable: true, - static_libs:[ + static_libs: [ "service-connectivity-pre-jarjar", ], jarjar_rules: "jarjar-rules.txt", diff --git a/packages/Connectivity/service/jarjar-rules.txt b/packages/Connectivity/service/jarjar-rules.txt index d8c60a428ef6..a7b419b020b5 100644 --- a/packages/Connectivity/service/jarjar-rules.txt +++ b/packages/Connectivity/service/jarjar-rules.txt @@ -1,3 +1,4 @@ +rule android.sysprop.** com.android.connectivity.sysprop.@1 rule com.android.net.module.util.** com.android.connectivity.net-utils.@1 rule com.android.modules.utils.** com.android.connectivity.modules-utils.@1 |