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

Commit 4cf550d6 authored by Wei Li's avatar Wei Li
Browse files

Clean the license metadata on dependencies of module android.test.legacy 

1) Moved the patched junit code in test-base and test-runner to a new directory test-junit which is under license CPL-1.0.
2) Clean the license metadata on packages in test-base, test-mock, test-runner and test-junit so packages have their license metadata precisely.
3) With this cleanup the Android.mk in test-legacy could be converted to Soong with license metadata handled properly, see b/319031379 and aosp/2900169.

Bug: 328809280
Test: CIs
Change-Id: I2a5832a97b09a5c7d064b8c2adbc0b04a325f326
parent 7aabac2b

test-base/Android.bp

+13 −26
Original line number Diff line number Diff line
@@ -14,37 +14,22 @@ 
// limitations under the License.

//



package {

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

}



// Build the android.test.base library

// ===================================

// This contains the junit.framework and android.test classes that were in

// Android API level 25 excluding those from android.test.runner.

// Also contains the com.android.internal.util.Predicate[s] classes.

package {

    // 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"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    //   SPDX-license-identifier-CPL-1.0

    default_applicable_licenses: ["frameworks_base_test-base_license"],

}



license {

    name: "frameworks_base_test-base_license",

    visibility: [":__subpackages__"],

    license_kinds: [

        "SPDX-license-identifier-Apache-2.0",

        "SPDX-license-identifier-CPL-1.0",

    ],

    license_text: [

        "src/junit/cpl-v10.html",

    ],

}



java_sdk_library {

    name: "android.test.base",



    srcs: [":android-test-base-sources"],

    srcs: [

        ":android-test-base-sources",

        ":frameworks-base-test-junit-framework",

    ],



    errorprone: {

        javacflags: ["-Xep:DepAnn:ERROR"],
@@ -84,7 +69,10 @@ java_library_static { 
    ],

    installable: false,



    srcs: [":android-test-base-sources"],

    srcs: [

        ":android-test-base-sources",

        ":frameworks-base-test-junit-framework",

    ],



    errorprone: {

        javacflags: ["-Xep:DepAnn:ERROR"],
@@ -104,8 +92,7 @@ java_library_static { 
    name: "android.test.base-minus-junit",



    srcs: [

        "src/android/**/*.java",

        "src/com/**/*.java",

        "src/**/*.java",

    ],



    sdk_version: "current",

test-base/hiddenapi/Android.bp

+1 −6
Original line number Diff line number Diff line
@@ -15,12 +15,7 @@ 
//



package {

    // 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"

    // 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"],

}



// Provided solely to contribute information about which hidden parts of the android.test.base

test-junit/Android.bp

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

// Copyright (C) 2024 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-test-junit-license"],

}



license {

    name: "frameworks-base-test-junit-license",

    visibility: [":__subpackages__"],

    license_kinds: [

        "SPDX-license-identifier-CPL-1.0",

    ],

    license_text: [

        "src/junit/cpl-v10.html",

    ],

}



filegroup {

    name: "frameworks-base-test-junit-framework",

    srcs: [

        "src/junit/framework/**/*.java",

    ],

    path: "src",

    visibility: [

        "//frameworks/base/test-base",

    ],

}



filegroup {

    name: "frameworks-base-test-junit-runner",

    srcs: [

        "src/junit/runner/**/*.java",

        "src/junit/textui/**/*.java",

    ],

    path: "src",

    visibility: [

        "//frameworks/base/test-runner",

    ],

}