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

Commit b9463a66 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Jarjar com.google.protobuf am: 84ba8158

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1402472

Change-Id: Ib83edf26853a70a783118f5b88ec2566de0682d6
parents 30d51c99 84ba8158
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ java_defaults {
        "netlink-client",
        "networkstack-client",
        "net-utils-framework-common",
        // See note on statsprotos when adding/updating proto build rules
        "datastallprotosnano",
        "statsprotos",
        "captiveportal-lib",
@@ -295,6 +296,8 @@ android_app {
    required: ["NetworkPermissionConfig"],
}

// When adding or modifying protos, the jarjar rules and possibly proguard rules need
// to be updated: proto libraries may pull additional static libraries.
java_library_static {
    name: "statsprotos",
    proto: {
+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
rule com.android.net.module.util.** com.android.networkstack.util.@1

rule com.android.internal.util.** android.net.networkstack.util.@1
rule com.google.protobuf.** com.android.networkstack.protobuf.@1

# Classes from net-utils-framework-common
rule com.android.net.module.util.** com.android.networkstack.util.@1
+7 −0
Original line number Diff line number Diff line
@@ -7,3 +7,10 @@
    static final int CMD_*;
    static final int EVENT_*;
}

# The lite proto runtime uses reflection to access fields based on the names in
# the schema, keep all the fields.
# This replicates the base proguard rule used by the build by default
# (proguard_basic_keeps.flags), but needs to be specified here because the
# com.google.protobuf package is jarjared to the below package.
-keepclassmembers class * extends com.android.networkstack.protobuf.MessageLite { <fields>; }