commit 57f88f72dbc732b21e0b22e741e0c6e768d8b63b
author Roshan Pius <rpius@google.com> Thu Jan 16 16:48:48 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 16 16:48:48 2020 +0000
tree b518b1c91a596237fc2a00872be116ebe0913350
parent 0034c9b68d6e435d6085e1b3acb1523d43194c0f
parent 6beb564bbce1541c00d0dd19ee71738d1283c2bb

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

staticlibs/Android.bp

diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index d3817a9..2c707ab 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/service",
+        "//frameworks/opt/net/wifi",
         "//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 a7fda7c..b22771d 100644
--- a/staticlibs/jarjar-rules-shared.txt
+++ b/staticlibs/jarjar-rules-shared.txt
@@ -1,2 +1,3 @@
+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
+rule com.android.internal.annotations.** com.android.net.module.annotation.@1
\ No newline at end of file