commit a4d4f94e21757148153711a2defe21bd45dc3337
author David Su <dysu@google.com> Mon Jan 13 20:21:26 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 13 20:21:26 2020 +0000
tree 74626b5a14887abe895f262fd842db8991a1a212
parent d80563874b4fa34287c5aed70e8d0ea5f9f9c575
parent 05d65140d9cee720309f69d3a8619fdd21c0f642

Merge changes from topics "wifi-copy-xmlutils", "wifi-systemmessageproto"

* changes:
  wifi-service: Remove jarjar of XmlUtils
  Statically link SystemMessageProto into wifi-service

Android.bp

diff --git a/Android.bp b/Android.bp
index 8a93fdb..908274d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1195,7 +1195,6 @@
         "core/java/com/android/internal/util/State.java",
         "core/java/com/android/internal/util/StateMachine.java",
         "core/java/com/android/internal/util/WakeupMessage.java",
-        "core/java/com/android/internal/util/XmlUtils.java",
     ],
 }
 

proto/Android.bp

diff --git a/proto/Android.bp b/proto/Android.bp
index 65bccbb..7cf6ce7 100644
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -27,3 +27,8 @@
     srcs: ["src/metrics_constants/metrics_constants.proto"],
     sdk_version: "system_current",
 }
+
+filegroup {
+    name: "system-messages-proto-src",
+    srcs: ["src/system_messages.proto"],
+}

wifi/jarjar-rules.txt

diff --git a/wifi/jarjar-rules.txt b/wifi/jarjar-rules.txt
index 0746d62..8f72040 100644
--- a/wifi/jarjar-rules.txt
+++ b/wifi/jarjar-rules.txt
@@ -11,7 +11,6 @@
 rule com.android.internal.util.State* com.android.server.x.wifi.util.State@1
 rule com.android.internal.util.StateMachine* com.android.server.x.wifi.util.StateMachine@1
 rule com.android.internal.util.WakeupMessage* com.android.server.x.wifi.util.WakeupMessage@1
-rule com.android.internal.util.XmlUtils* com.android.server.x.wifi.util.XmlUtils@1
 
 rule android.util.BackupUtils* com.android.server.x.wifi.util.BackupUtils@1
 rule android.util.LocalLog* com.android.server.x.wifi.util.LocalLog@1
@@ -23,6 +22,8 @@
 rule org.bouncycastle.** com.android.server.x.wifi.bouncycastle.@1
 # Use our statically linked protobuf library
 rule com.google.protobuf.** com.android.server.x.wifi.protobuf.@1
+# use statically linked SystemMessageProto
+rule com.android.internal.messages.SystemMessageProto* com.android.server.x.wifi.messages.SystemMessageProto@1
 # Use our statically linked PlatformProperties library
 rule android.sysprop.** com.android.server.x.wifi.sysprop.@1