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

Commit e7c00c4b authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Jarjar com.google.protobuf 

This avoids potential conflicts if the library is also added to the
bootclasspath.

com.google.protobuf is pulled as a dependency when adding protobuffers,
like those used for data stall, IP provisioning and validation metrics.

Bug: 159587267
Test: m; manual: booted, wifi working

Change-Id: I3339e47c1ca1cd8b0186da0dbf880eff245b4c67
parent 0c423089

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -91,6 +91,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",
@@ -293,6 +294,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: {

jarjar-rules-shared.txt

+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

proguard.flags

+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>; }