From 3a57ae61da1f9633b95ab6bb07f33b923660ee4f Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 30 May 2022 16:41:42 +0000
Subject: [PATCH 1/3] Revert^2 "Convert filegroup to library"

5fca5ff385d86ccd1a642ae2ae57d00a2e45acdb

Change-Id: I1a020fffc6345a131453b27d6f8bc2cf0acb942b
(cherry picked from commit 4e8ccccbecef4f544641ce31b155845afb791975)
Merged-In: I1a020fffc6345a131453b27d6f8bc2cf0acb942b
---
 core/java/Android.bp    | 22 ++++++++--------------
 services/net/Android.bp |  1 -
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/core/java/Android.bp b/core/java/Android.bp
index 77589a213e170..b13413a73c255 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -171,11 +171,14 @@ java_library {
     static_libs: ["modules-utils-uieventlogger-interface"],
 }
 
-filegroup {
-    name: "framework-services-net-module-wifi-shared-srcs",
-    srcs: [
-        "android/util/LocalLog.java",
-    ],
+java_library {
+    name: "modules-utils-locallog",
+    srcs: ["android/util/LocalLog.java"],
+    libs: ["unsupportedappusage"],
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    apex_available: ["//apex_available:anyapex"],
+    visibility: ["//visibility:public"],
 }
 
 // keep these files in sync with the package/Tethering/jarjar-rules.txt and
@@ -411,15 +414,6 @@ filegroup {
     ],
 }
 
-// Avoid including Parcelable classes as we don't want to have two copies of
-// Parcelable cross the process.
-filegroup {
-    name: "framework-cellbroadcast-shared-srcs",
-    srcs: [
-        "android/util/LocalLog.java",
-    ],
-}
-
 java_library {
     name: "modules-utils-statemachine",
     srcs: [
diff --git a/services/net/Android.bp b/services/net/Android.bp
index 0c3f1dd3589d5..1b64d3aaa5614 100644
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -35,7 +35,6 @@ java_library_static {
 java_library {
     name: "services.net-module-wifi",
     srcs: [
-        ":framework-services-net-module-wifi-shared-srcs",
         ":net-utils-services-common-srcs",
     ],
     sdk_version: "module_current",

From 50d160d2baa1655a342d2ae8c76def3165bbcb1b Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 30 May 2022 17:08:32 +0000
Subject: [PATCH 2/3] Make modules-utils-locallog available to platform

Makes CellBroadcastServicePlatform able to use it.

Test: lunch aosp_cf_arm_only_phone && m nothing
Change-Id: Ic62dff140f81db9aac4728ba98b44e6fbbdc9c0c
(cherry picked from commit a08352e83802a66444dbaab1e40fbca53e5a1cf9)
Merged-In: Ic62dff140f81db9aac4728ba98b44e6fbbdc9c0c
---
 core/java/Android.bp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/java/Android.bp b/core/java/Android.bp
index b13413a73c255..f7328457b379c 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -177,7 +177,10 @@ java_library {
     libs: ["unsupportedappusage"],
     sdk_version: "module_current",
     min_sdk_version: "30",
-    apex_available: ["//apex_available:anyapex"],
+    apex_available: [
+        "//apex_available:anyapex",
+        "//apex_available:platform",
+    ],
     visibility: ["//visibility:public"],
 }
 

From bcd6a7d75184cf68367e27e489814d744d3049f7 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 30 May 2022 11:58:01 +0000
Subject: [PATCH 3/3] Use already compiled library

No point compiling these sources once again, just use the existing
library.

Test: m com.android.wifi
Change-Id: I304bff8f34c3d4d9e00be31c9aa3c40c63cd0dd0
(cherry picked from commit 93298d6e832e35acdcca009f4674f7818ea060fe)
Merged-In: I304bff8f34c3d4d9e00be31c9aa3c40c63cd0dd0
---
 services/net/Android.bp | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/services/net/Android.bp b/services/net/Android.bp
index 1b64d3aaa5614..886a397c87e6f 100644
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -34,30 +34,19 @@ java_library_static {
 // with dependencies moved to frameworks/libs/net right.
 java_library {
     name: "services.net-module-wifi",
-    srcs: [
-        ":net-utils-services-common-srcs",
-    ],
     sdk_version: "module_current",
     min_sdk_version: "30",
-    libs: [
-        "framework-annotations-lib",
-        "unsupportedappusage",
-        "framework-wifi-util-lib",
-        "framework-connectivity",
-        "modules-utils-build_system",
-    ],
     static_libs: [
         // All the classes in netd_aidl_interface must be jarjar so they do not conflict with the
         // classes generated by netd_aidl_interfaces-platform-java above.
         "netd_aidl_interface-V3-java",
         "networkstack-client",
+        "net-utils-services-common",
     ],
     apex_available: [
         "com.android.wifi",
     ],
     visibility: [
-        "//frameworks/opt/net/wifi/service",
-        "//frameworks/opt/net/wifi/tests/wifitests",
         "//packages/modules/Wifi/service",
         "//packages/modules/Wifi/service/tests/wifitests",
     ],