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

Commit f5186a51 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "[LSC] Add LOCAL_LICENSE_KINDS to system/core"" am: ca474f99... 

Merge "Revert "[LSC] Add LOCAL_LICENSE_KINDS to system/core"" am: ca474f99 am: aea25045 am: fa48b67e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1590280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdbd05d3e1c993bf1b6c92161669555fba108abd
parents 10bfeb78 fa48b67e

Android.bp

deleted100644 → 0
+0 −45
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: ["system_core_license"],

}



// Added automatically by a large-scale-change that took the approach of

// 'apply every license found to every target'. While this makes sure we respect

// every license restriction, it may not be entirely correct.

//

// e.g. GPL in an MIT project might only apply to the contrib/ directory.

//

// Please consider splitting the single license below into multiple licenses,

// taking care not to lose any license_kind information, and overriding the

// default license using the 'licenses: [...]' property on targets as needed.

//

// For unused files, consider creating a 'fileGroup' with "//visibility:private"

// to attach the license to, and including a comment whether the files may be

// used in the current project.

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

license {

    name: "system_core_license",

    visibility: [":__subpackages__"],

    license_kinds: [

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

        "SPDX-license-identifier-BSD",

        "SPDX-license-identifier-MIT",

    ],

    license_text: [

        "NOTICE",

    ],

}

bootstat/Android.bp

+0 −9
Original line number Diff line number Diff line
@@ -14,15 +14,6 @@ 
// limitations under the License.

//



package {

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

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

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["system_core_license"],

}



bootstat_lib_src_files = [

    "boot_event_record_store.cpp",

]

cli-test/Android.bp

+0 −9
Original line number Diff line number Diff line 
package {

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

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

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["system_core_license"],

}



cc_binary {

    name: "cli-test",

    host_supported: true,

code_coverage/Android.bp

+0 −9
Original line number Diff line number Diff line 


package {

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

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

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["system_core_license"],

}



prebuilt_etc {

    name: "code_coverage.policy",

    sub_dir: "seccomp_policy",

cpio/Android.bp

+0 −9
Original line number Diff line number Diff line 
// Copyright 2005 The Android Open Source Project



package {

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

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

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["system_core_license"],

}



cc_binary_host {

    name: "mkbootfs",

    srcs: ["mkbootfs.c"],