Merge "Cellbroadcast util lib"

am: 80e531234f

Change-Id: I0f410dbc0f0df09dbe3aa1a8fe88f68b6a8e2ca9

1 files changed, 12 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 77f024bab01e..408cf7ac0edc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1531,3 +1531,15 @@ genrule {
         targets: ["droidcore"],
     },
 }
+
+// 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: [
+        "core/java/android/util/LocalLog.java",
+        "core/java/android/util/Slog.java",
+        "core/java/com/android/internal/util/State.java",
+        "core/java/com/android/internal/util/StateMachine.java",
+    ],
+}