Merge "Cellbroadcast util lib" am: 80e531234f am: 47a4b525f8

am: a19f5c24d5 Change-Id: Ie961c40a8910877fff326609b0c80aa0dc10e0fe
2019-10-19 22:37:15 -07:00
parent 4c3d8cf133 a19f5c24d5
commit 23a97352cc
1 changed files with 12 additions and 0 deletions
--- 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",
+    ],
+}