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

Commit c52aeaa3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add shared jarjar rule for tethering tests" am: 29dc6712 am:... 

Merge "Add shared jarjar rule for tethering tests" am: 29dc6712 am: 2dc283ee am: dc937ecd am: 9e5cd941

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473223

Change-Id: I24795bc612d7956ea8f2776c90810ea5c5eca39e
parents 813ea77a 9e5cd941

packages/Tethering/tests/Android.bp

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
//

// Copyright (C) 2020 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



filegroup {

    name: "TetheringTestsJarJarRules",

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

    visibility: [

        "//frameworks/base/packages/Tethering/tests:__subpackages__",

    ]

}

packages/Tethering/tests/integration/Android.bp

+2 −1
Original line number Original line Diff line number Diff line
@@ -79,6 +79,7 @@ android_test { 
        // For NetworkStackUtils included in NetworkStackBase

        // For NetworkStackUtils included in NetworkStackBase

        "libnetworkstackutilsjni",

        "libnetworkstackutilsjni",

    ],

    ],

    jarjar_rules: ":TetheringTestsJarJarRules",

    compile_multilib: "both",

    compile_multilib: "both",

    manifest: "AndroidManifest_coverage.xml",

    manifest: "AndroidManifest_coverage.xml",

}
 
}

packages/Tethering/tests/unit/jarjar-rules.txt→packages/Tethering/tests/jarjar-rules.txt

+4 −1
Original line number Original line Diff line number Diff line
@@ -10,6 +10,9 @@ rule com.android.internal.util.TrafficStatsConstants* com.android.networkstack.t 




rule android.util.LocalLog* com.android.networkstack.tethering.util.LocalLog@1

rule android.util.LocalLog* com.android.networkstack.tethering.util.LocalLog@1





# Classes from net-utils-framework-common

rule com.android.net.module.util.** com.android.networkstack.tethering.util.@1



# TODO: either stop using frameworks-base-testutils or remove the unit test classes it contains.

# TODO: either stop using frameworks-base-testutils or remove the unit test classes it contains.

# TestableLooper from "testables" can be used instead of TestLooper from frameworks-base-testutils.

# TestableLooper from "testables" can be used instead of TestLooper from frameworks-base-testutils.

zap android.os.test.TestLooperTest*

zap android.os.test.TestLooperTest*

packages/Tethering/tests/unit/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,6 @@ java_defaults { 
        "libdexmakerjvmtiagent",

        "libdexmakerjvmtiagent",

        "libstaticjvmtiagent",

        "libstaticjvmtiagent",

    ],

    ],

    jarjar_rules: "jarjar-rules.txt",

}

}





// Library containing the unit tests. This is used by the coverage test target to pull in the

// Library containing the unit tests. This is used by the coverage test target to pull in the
@@ -89,6 +88,7 @@ android_test { 
        "device-tests",

        "device-tests",

        "mts",

        "mts",

    ],

    ],

    jarjar_rules: ":TetheringTestsJarJarRules",

    defaults: ["TetheringTestsDefaults"],

    defaults: ["TetheringTestsDefaults"],

    compile_multilib: "both",

    compile_multilib: "both",

}
 
}