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

Commit 77c8ef1e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Link PlatformProperties statically" am: 9b7d20fc am: c2aa1905 

Change-Id: Ib42a0b698b6e54094ce0140e48a0de06d2b7fb8d
parents a219cb82 c2aa1905

Android.bp

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

    path: "src/java",

}



filegroup {

    name: "jarjar-rules-shared",

    srcs: ["jarjar-rules-shared.txt"],
@@ -75,6 +76,7 @@ java_library { 
        "android.hardware.radio.deprecated-V1.0-java-shallow",

        "ecc-protos-lite",

        "libphonenumber-nogeocoder",

        "PlatformProperties",

        "telephony-protos",

    ],
@@ -85,4 +87,3 @@ java_library { 
        },

    },

}

jarjar-rules-shared.txt

+1 −0
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