commit c2f6a875bd4f810f4b8c9553ac70cf5240a23083
author Jinfeng Du <jinfengdu@google.com> Mon May 30 15:36:12 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 30 15:36:12 2022 +0000
tree f0028d2a8725009fd627d20d37970b1b370bdf6a
parent 8edb229d23a7990214785338adf53a311e8c5d08
parent 53d695ed205d1156ed6fc04d7f3fa7b06d13715c

Merge "Revert "Convert filegroup to library"" am: 0801f8008b am: 53d695ed20

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2110247

Change-Id: I2cfff0eccca0a9e3860297b32c1a54c2f83f7340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/Android.bp

diff --git a/core/java/Android.bp b/core/java/Android.bp
index b13413a..77589a2 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -171,14 +171,11 @@
     static_libs: ["modules-utils-uieventlogger-interface"],
 }
 
-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"],
+filegroup {
+    name: "framework-services-net-module-wifi-shared-srcs",
+    srcs: [
+        "android/util/LocalLog.java",
+    ],
 }
 
 // keep these files in sync with the package/Tethering/jarjar-rules.txt and
@@ -414,6 +411,15 @@
     ],
 }
 
+// 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: [

services/net/Android.bp

diff --git a/services/net/Android.bp b/services/net/Android.bp
index 1b64d3a..0c3f1dd 100644
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -35,6 +35,7 @@
 java_library {
     name: "services.net-module-wifi",
     srcs: [
+        ":framework-services-net-module-wifi-shared-srcs",
         ":net-utils-services-common-srcs",
     ],
     sdk_version: "module_current",