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

Commit 0353bb9d authored by Aaron Huang's avatar Aaron Huang
Browse files

Create a service-connectivity-pre-jarjar library 

This is needed for FrameworksNetTests because it inculdes
service-connectivity. Without this library, the service-connectivity
is already jarjar-ed which will cause the util classes couldn't be
found when running the tests. So let the tests inculde the pre-jarjar
version and service-connectivity applies the jarjar to this library.

Bug: 177046265
Test: FrameworksNetTests
Change-Id: I1acd95ff9bec99b918646e8ec3a57f3ef156e2ca
Merged-In: I1acd95ff9bec99b918646e8ec3a57f3ef156e2ca
parent 643fb23a

Android.bp

+5 −2
Original line number Diff line number Diff line
@@ -834,17 +834,20 @@ filegroup { 
    ],

}



// keep these files in sync with the package/Tethering/jarjar-rules.txt for the tethering module.

// keep these files in sync with the package/Tethering/jarjar-rules.txt and

// package/Connectivity/jarjar-rules.txt for the tethering module and connectivity module.

filegroup {

    name: "framework-tethering-shared-srcs",

    name: "framework-connectivity-shared-srcs",

    srcs: [

        "core/java/android/util/LocalLog.java",

        // This should be android.util.IndentingPrintWriter, but it's not available in all branches.

        "core/java/com/android/internal/util/IndentingPrintWriter.java",

        "core/java/com/android/internal/util/IState.java",

        "core/java/com/android/internal/util/MessageUtils.java",

        "core/java/com/android/internal/util/State.java",

        "core/java/com/android/internal/util/StateMachine.java",

        "core/java/com/android/internal/util/TrafficStatsConstants.java",

        "core/java/com/android/internal/util/WakeupMessage.java",

    ],

}

packages/Connectivity/service/Android.bp

+15 −3
Original line number Diff line number Diff line
@@ -50,12 +50,11 @@ cc_library_shared { 
}



java_library {

    name: "service-connectivity",

    name: "service-connectivity-pre-jarjar",

    srcs: [

        ":framework-connectivity-shared-srcs",

        ":connectivity-service-srcs",

    ],

    installable: true,

    jarjar_rules: "jarjar-rules.txt",

    libs: [

        "android.net.ipsec.ike",

        "services.core",
@@ -73,3 +72,16 @@ java_library { 
        "com.android.tethering",

    ],

}



java_library {

    name: "service-connectivity",

    installable: true,

    static_libs:[

        "service-connectivity-pre-jarjar",

    ],

    jarjar_rules: "jarjar-rules.txt",

    apex_available: [

        "//apex_available:platform",

        "com.android.tethering",

    ],

}

packages/Connectivity/service/jarjar-rules.txt

+12 −1
Original line number Diff line number Diff line 
rule com.android.net.module.util.** com.android.connectivity.net-utils.@1

rule com.android.modules.utils.** com.android.connectivity.modules-utils.@1



# internal util classes

# Exclude AsyncChannel. TODO: remove AsyncChannel usage in ConnectivityService

rule com.android.internal.util.AsyncChannel* @0

# Exclude LocationPermissionChecker. This is going to be moved to libs/net

rule com.android.internal.util.LocationPermissionChecker* @0

rule android.util.LocalLog* com.android.connectivity.util.LocalLog@1

# android.util.IndentingPrintWriter* should use a different package name from

# the one in com.android.internal.util

rule android.util.IndentingPrintWriter* android.connectivity.util.IndentingPrintWriter@1

rule com.android.internal.util.** com.android.connectivity.util.@1

tests/net/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ android_test { 
        "mockito-target-minus-junit4",

        "net-tests-utils",

        "platform-test-annotations",

        "service-connectivity",

        "service-connectivity-pre-jarjar",

        "services.core",

        "services.net",

    ],