diff options
| author | David Su <dysu@google.com> | 2020-01-12 15:41:07 -0800 |
|---|---|---|
| committer | David Su <dysu@google.com> | 2020-01-12 18:35:01 -0800 |
| commit | 6bb0d10cf7c7c6a0ce1e7dee1a688f1fa9946f33 (patch) | |
| tree | 604395c95302cc34d3bf5c2a0e209e0c7898fb16 | |
| parent | 7f528b9a3309f3a3ffc16827954e9acaefe7cf6b (diff) | |
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
| -rw-r--r-- | proto/Android.bp | 5 | ||||
| -rw-r--r-- | wifi/jarjar-rules.txt | 2 |
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 |