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

Commit 7634bcfa authored by markchien's avatar markchien
Browse files

Add shared jarjar rule for tethering tests

Also jarjar com.android.net.module.util* to
com.android.networkstack.tethering.util*.

Bug: 171670016
Test: atest TetheringCoverageTests
Change-Id: I3bde9ad3c41adf36da99bd944303d88ce992201c
parent 02fe8ac1
Loading
Loading
Loading
Loading
+23 −0
Original line number 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__",
    ]
}
+2 −1
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ android_test {
        // For NetworkStackUtils included in NetworkStackBase
        "libnetworkstackutilsjni",
    ],
    jarjar_rules: ":TetheringTestsJarJarRules",
    compile_multilib: "both",
    manifest: "AndroidManifest_coverage.xml",
}
+4 −1
Original line number 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

# 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.
# TestableLooper from "testables" can be used instead of TestLooper from frameworks-base-testutils.
zap android.os.test.TestLooperTest*
+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ java_defaults {
        "libdexmakerjvmtiagent",
        "libstaticjvmtiagent",
    ],
    jarjar_rules: "jarjar-rules.txt",
}

// Library containing the unit tests. This is used by the coverage test target to pull in the
@@ -88,6 +87,7 @@ android_test {
        "device-tests",
        "mts",
    ],
    jarjar_rules: ":TetheringTestsJarJarRules",
    defaults: ["TetheringTestsDefaults"],
    compile_multilib: "both",
}