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

Commit a4d4f94e authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

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

* changes:
  wifi-service: Remove jarjar of XmlUtils
  Statically link SystemMessageProto into wifi-service
parents d8056387 05d65140

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -1195,7 +1195,6 @@ filegroup { 
        "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

+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 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ rule com.android.internal.util.MessageUtils* com.android.server.x.wifi.util.Mess 
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 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