summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--proto/Android.bp5
-rw-r--r--wifi/jarjar-rules.txt2
2 files changed, 7 insertions, 0 deletions
diff --git a/proto/Android.bp b/proto/Android.bp
index 65bccbb4aac8..7cf6ce740969 100644
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -27,3 +27,8 @@ java_library_static {
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 0746d62d5115..a76a455f6333 100644
--- a/wifi/jarjar-rules.txt
+++ b/wifi/jarjar-rules.txt
@@ -23,6 +23,8 @@ rule android.os.BasicShellCommandHandler* com.android.server.x.wifi.os.BasicShel
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