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

Commit 2d958cdd authored by Meng Wang's avatar Meng Wang
Browse files

Link PlatformProperties statically 

Use jarjar rule to prevent class duplication.

Bug: 141246285
Test: make
Change-Id: I362495413bab10969732fd9c3fd6ca02b5bcd6fb
parent bdb0d60d

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"],
@@ -74,6 +75,7 @@ java_library { 
        "android.hardware.radio.deprecated-V1.0-java-shallow",

        "ecc-protos-lite",

        "libphonenumber-nogeocoder",

        "PlatformProperties",

        "telephony-protos",

    ],
@@ -84,4 +86,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