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

Commit 83e8ee8d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Allow usage of SdkLevel in telephony"

parents 3482bc94 4d04ca88

Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -120,6 +120,7 @@ java_library { 
        "PlatformProperties",

        "PlatformProperties",

        "net-utils-framework-common",

        "net-utils-framework-common",

        "telephony-protos",

        "telephony-protos",

        "modules-utils-build_system",

    ],

    ],





    product_variables: {

    product_variables: {

tests/telephonytests/jarjar-rules-tests.txt

+4 −2
Original line number Original line Diff line number Diff line
@@ -7,6 +7,8 @@ rule android.net.NetworkFactory* android.net.services.NetworkFactory@1 




# Telephony-common has already included net-utils-framework-common lib and jarjars

# Telephony-common has already included net-utils-framework-common lib and jarjars

# the package name. FrameworksTelephonyTests also includes net-utils-framework-common

# the package name. FrameworksTelephonyTests also includes net-utils-framework-common

# via net-tests-utils and tries to jarjar it again. Rename the package name with

# via net-tests-utils and tries to jarjar it again. Rename the package names with

# differnt prefix in the test jarjar rule to avoid duplicate jar entries.

# a different prefix in the test jarjar rule to avoid duplicate jar entries.

rule com.android.net.module.util.** com.android.internal.telephony.util.test.@1

rule com.android.net.module.util.** com.android.internal.telephony.util.test.@1

# Similarly, this is needed for the build utils.

rule com.android.modules.utils.** com.android.internal.telephony.util.test.@1