commit 0034c9b68d6e435d6085e1b3acb1523d43194c0f
author Roshan Pius <rpius@google.com> Thu Jan 16 13:05:13 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 16 13:05:13 2020 +0000
tree efb94fd5c9b3dc096f3702412317f107b938da5d
parent 4898ad4a36498f67fdfc90eb214d9df39eb9a25b
parent 480b00e8469871b479d981a3712458857b75484c

Merge "libs(net/common): Fixes for wifi to include"

staticlibs/Android.bp

diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 2c707ab..d3817a9 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -41,7 +41,7 @@
     jarjar_rules: "jarjar-rules-shared.txt",
     visibility: [
         "//frameworks/base/packages/Tethering",
-        "//frameworks/opt/net/wifi",
+        "//frameworks/opt/net/wifi/service",
         "//frameworks/opt/net/ike",
         "//frameworks/opt/telephony",
         "//packages/modules/NetworkStack",

staticlibs/jarjar-rules-shared.txt

diff --git a/staticlibs/jarjar-rules-shared.txt b/staticlibs/jarjar-rules-shared.txt
index b22771d..a7fda7c 100644
--- a/staticlibs/jarjar-rules-shared.txt
+++ b/staticlibs/jarjar-rules-shared.txt
@@ -1,3 +1,2 @@
-rule android.net.util.** com.android.net.module.util.@1
 rule android.annotation.** com.android.net.module.annotation.@1
-rule com.android.internal.annotations.** com.android.net.module.annotation.@1
\ No newline at end of file
+rule com.android.internal.annotations.** com.android.net.module.annotation.@1