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

Commit b0861f4c authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Move connectivity test defaults to tests/common 

The build file currently holds a single build rule in test/. Move it to
the existing build file in tests/common/Android.bp.

Test: m
Bug: 186628461
Change-Id: I3948c9b46e2647f945a22f16aad493e94fe50b4d
parent 24367cc0

packages/Connectivity/test/Android.bp

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
//

// Copyright (C) 2021 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.

//



package {

    default_applicable_licenses: ["frameworks_base_license"],

}



// defaults for tests that need to build against framework-connectivity's @hide APIs

// Only usable from targets that have visibility on framework-connectivity.impl.

// Instead of using this, consider avoiding to depend on hidden connectivity APIs in

// tests.

java_defaults {

    name: "framework-connectivity-test-defaults",

    sdk_version: "core_platform", // tests can use @CorePlatformApi's

    libs: [

        // order matters: classes in framework-connectivity are resolved before framework,

        // meaning @hide APIs in framework-connectivity are resolved before @SystemApi

        // stubs in framework

        "framework-connectivity.impl",

        "framework",



        // if sdk_version="" this gets automatically included, but here we need to add manually.

        "framework-res",

    ],

}

packages/Connectivity/tests/common/Android.bp

+19 −0
Original line number Diff line number Diff line
@@ -46,3 +46,22 @@ java_library { 
        "android.test.base.stubs",

    ],

}



// defaults for tests that need to build against framework-connectivity's @hide APIs

// Only usable from targets that have visibility on framework-connectivity.impl.

// Instead of using this, consider avoiding to depend on hidden connectivity APIs in

// tests.

java_defaults {

    name: "framework-connectivity-test-defaults",

    sdk_version: "core_platform", // tests can use @CorePlatformApi's

    libs: [

        // order matters: classes in framework-connectivity are resolved before framework,

        // meaning @hide APIs in framework-connectivity are resolved before @SystemApi

        // stubs in framework

        "framework-connectivity.impl",

        "framework",



        // if sdk_version="" this gets automatically included, but here we need to add manually.

        "framework-res",

    ],

}