prepare cellbroadcastservice to be a mainline module
1. prepare two build targets one for updatable module another
for the legacy platform module with diferent config
2. switch to the updatable module as this is a mandatory module
3. update jarjar rules
Bug: 135956699
Test: unit test and test app
Change-Id: I1b3fad912c6fa5b921fef077301005a6af0c6402
diff --git a/cellbroadcast-jarjar-rules.txt b/cellbroadcast-jarjar-rules.txt
index b50ec50..a5068c7 100644
--- a/cellbroadcast-jarjar-rules.txt
+++ b/cellbroadcast-jarjar-rules.txt
@@ -1,4 +1,2 @@
-rule android.util.LocalLog* com.android.cellbroadcast.LocalLog@1
-rule android.util.Slog* com.android.cellbroadcast.Slog@1
-rule com.android.internal.util.State* com.android.cellbroadcastservice.State@1
-rule com.android.internal.util.StateMachine* com.android.cellbroadcastservice.StateMachine@1
+rule android.util.LocalLog* com.android.cellbroadcastservice.LocalLog@1
+rule android.util.Slog* com.android.cellbroadcastservice.Slog@1