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

Commit 6f711675 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Link PlatformProperties statically""

parents 1439e2b2 2a4fe63d

Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ filegroup { 
    ],

    path: "src/java",

}



filegroup {

    name: "jarjar-rules-shared",

    srcs: ["jarjar-rules-shared.txt"],
@@ -73,9 +72,8 @@ java_library { 
        "android.hardware.radio.config-V1.1-java-shallow",

        "android.hardware.radio.config-V1.2-java-shallow",

        "android.hardware.radio.deprecated-V1.0-java-shallow",

        "ecc-protos-lite",

        "PlatformProperties",

        "telephony-protos",

        "ecc-protos-lite",

    ],



    product_variables: {
@@ -85,3 +83,4 @@ java_library { 
        },

    },

}

jarjar-rules-shared.txt

+0 −1
Original line number Diff line number Diff line 
rule android.os.RegistrantList* com.android.internal.telephony.RegistrantList@1

rule android.os.Registrant* com.android.internal.telephony.Registrant@1

rule android.hidl.** android.internal.hidl.@1

rule android.sysprop.** android.internal.telephony.sysprop.@1

rule android.util.LocalLog* com.android.internal.telephony.LocalLog@1

rule android.util.TimeUtils* com.android.internal.telephony.TimeUtils@1

rule com.android.internal.os.SomeArgs* com.android.internal.telephony.SomeArgs@1