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

Commit f5d1a6ea authored by Yan Yan's avatar Yan Yan Committed by Android (Google) Code Review
Browse files

Merge "Prepare to move VCN: Change license of VCN UT" into main

parents 3b489717 b31728fb

packages/Vcn/framework-b/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -173,7 +173,11 @@ java_sdk_library { 
    impl_library_visibility: [

        // Using for test only

        "//cts/tests/netlegacy22.api",



        // TODO: b/374174952 Clean up VCN paths when the code location is finalized

        "//cts/tests/tests/vcn",

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



        "//external/sl4a:__subpackages__",

        "//frameworks/base/core/tests/bandwidthtests",

        "//frameworks/base/core/tests/benchmarks",

tests/vcn/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ package { 
    default_team: "trendy_team_enigma",

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // all of the 'license_kinds' from "Android-Apache-2.0"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

    default_applicable_licenses: ["Android-Apache-2.0"],

}



android_test {