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

Commit 4d04ca88 authored by Chalard Jean's avatar Chalard Jean
Browse files

Allow usage of SdkLevel in telephony 

This is necessary for TelephonyNetworkFactory because it uses
the static lib NetworkFactory which needs to test where it runs.

CP of ag/14309298

Bug: 183902758
Test: ClientModeImplTest
      OemWifiNetworkFactoryTest
      TelephonyNetworkFactoryTest
      UntrustedWifiNetworkFactoryTest
      WifiNetworkFactoryTest
Change-Id: I765bcb17901a2c9862d5879d524cbf522b6c7526
Merged-In: I765bcb17901a2c9862d5879d524cbf522b6c7526
parent 989232c4

Android.bp

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

        "net-utils-framework-common",

        "telephony-protos",

        "modules-utils-build_system",

    ],



    product_variables: {

tests/telephonytests/jarjar-rules-tests.txt

+4 −2
Original line number 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

# 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

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

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

# 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

# Similarly, this is needed for the build utils.

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