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

Commit b9b46159 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 fbfc50a5

Android.bp

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

    ],

    path: "src/java",

    path: "src/java",

}

}



filegroup {

filegroup {

    name: "jarjar-rules-shared",

    name: "jarjar-rules-shared",

    srcs: ["jarjar-rules-shared.txt"],

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

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

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

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

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

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

        "telephony-protos",

        "ecc-protos-lite",

        "ecc-protos-lite",

        "PlatformProperties",

        "telephony-protos",

    ],

    ],





    product_variables: {

    product_variables: {
@@ -82,4 +84,3 @@ java_library { 
        },

        },

    },

    },

}
 
}

jarjar-rules-shared.txt

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

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

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

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

rule android.hidl.** android.internal.hidl.@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.LocalLog* com.android.internal.telephony.LocalLog@1

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

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

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

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