Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bb0d10c authored by David Su's avatar David Su
Browse files

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
parent 7f528b9a

proto/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -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"],

}

wifi/jarjar-rules.txt

+2 −0
Original line number Diff line number Diff line
@@ -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