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

Commit 8003fdc7 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Add framework-connectivity-test-defaults" into sc-dev am: f8365783 

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

Change-Id: Ia76c84216aef7a830a4e105b21711f1186a037a9
parents 7e58dae0 f8365783

packages/Connectivity/framework/Android.bp

+10 −1
Original line number Diff line number Diff line
@@ -121,7 +121,16 @@ java_sdk_library { 
        "//packages/modules/Connectivity/service",

        "//frameworks/base/packages/Connectivity/service",

        "//frameworks/base",

        "//packages/modules/Connectivity/Tethering/tests/unit",



        // Tests using hidden APIs

        "//external/sl4a:__subpackages__",

        "//frameworks/base/tests/net:__subpackages__",

        "//frameworks/libs/net/common/testutils",

        "//frameworks/libs/net/common/tests:__subpackages__",

        "//frameworks/opt/telephony/tests/telephonytests",

        "//packages/modules/Connectivity/Tethering/tests:__subpackages__",

        "//packages/modules/Connectivity/tests:__subpackages__",

        "//packages/modules/NetworkStack/tests:__subpackages__",

    ],

    apex_available: [

        "com.android.tethering",

packages/Connectivity/test/Android.bp

0 → 100644
+38 −0
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",

    ],

}

tests/net/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -51,12 +51,14 @@ java_defaults { 


android_test {

    name: "FrameworksNetTests",

    defaults: ["FrameworksNetTests-jni-defaults"],

    defaults: [

        "framework-connectivity-test-defaults",

        "FrameworksNetTests-jni-defaults",

    ],

    srcs: [

        "java/**/*.java",

        "java/**/*.kt",

    ],

    platform_apis: true,

    test_suites: ["device-tests"],

    certificate: "platform",

    jarjar_rules: "jarjar-rules.txt",

tests/net/common/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -27,7 +27,11 @@ package { 


java_library {

    name: "FrameworksNetCommonTests",

    srcs: ["java/**/*.java", "java/**/*.kt"],

    defaults: ["framework-connectivity-test-defaults"],

    srcs: [

        "java/**/*.java",

        "java/**/*.kt",

    ],

    static_libs: [

        "androidx.core_core",

        "androidx.test.rules",