Statically link SystemMessageProto into wifi-service
Statically link SystemMessagesProto since Wifi
uses a few constants defined here e.g.
NOTE_NETWORK_NO_MAC_RANDOMIZATION_SUPPORT,
NOTE_NETWORK_AVAILABLE, etc.
Proto should ensure backwards compatibility of
these constants.
Bug: 147387246
Test: compiles
Change-Id: Id6e704fa50e3500d191ecfa57cbb5a237dfaf01a
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"],
+}
diff --git a/wifi/jarjar-rules.txt b/wifi/jarjar-rules.txt
index 0746d62..a76a455 100644
--- a/wifi/jarjar-rules.txt
+++ b/wifi/jarjar-rules.txt
@@ -23,6 +23,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