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

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

Merge "Jarjar com.google.protobuf" into rvc-dev am: 65e067f3 am: 4a61b59c... 

Merge "Jarjar com.google.protobuf" into rvc-dev am: 65e067f3 am: 4a61b59c am: e3f84d34 am: 6c27be46

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

Change-Id: Ifa911041cd32915ee9dfcb6f936f968f0ac2e5e4
parents e5a574d8 6c27be46

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