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

Commit a2a77738 authored by Bob Badour's avatar Bob Badour
Browse files

Revert "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/native" 

This reverts commit f84491a4.

This reverts commit 2e671852.

Change-Id: I1a9655335b856d6909b27929e00c0bde3186d893
parent 79e26e17

Android.bp

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

    default_applicable_licenses: ["frameworks_native_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.

//

// large-scale-change filtered out the below license kinds as false-positives:

//   SPDX-license-identifier-LGPL

//   SPDX-license-identifier-LGPL-2.1

//   SPDX-license-identifier-LGPL-3.0

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

license {

    name: "frameworks_native_license",

    visibility: [":__subpackages__"],

    license_kinds: [

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

        "SPDX-license-identifier-BSD",

        "SPDX-license-identifier-MIT",

        "SPDX-license-identifier-Unicode-DFS",

        "legacy_notice",

    ],

    license_text: [

        "NOTICE",

    ],

}



ndk_headers {

ndk_headers {

    name: "libandroid_headers",

    name: "libandroid_headers",

    from: "include/android",

    from: "include/android",

cmds/atrace/Android.bp

+0 −17
Original line number Original line Diff line number Diff line 
// Copyright 2012 The Android Open Source Project

// Copyright 2012 The Android Open Source Project





package {

    default_applicable_licenses: ["frameworks_native_cmds_atrace_license"],

}



// Added automatically by a large-scale-change

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

license {

    name: "frameworks_native_cmds_atrace_license",

    visibility: [":__subpackages__"],

    license_kinds: [

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

    ],

    license_text: [

        "NOTICE",

    ],

}



cc_binary {

cc_binary {

    name: "atrace",

    name: "atrace",

    srcs: ["atrace.cpp"],

    srcs: ["atrace.cpp"],

cmds/bugreport/Android.bp

+0 −9
Original line number Original line 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 "frameworks_native_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_native_license"],

}



cc_binary {

cc_binary {

    name: "bugreport",

    name: "bugreport",

    srcs: ["bugreport.cpp"],

    srcs: ["bugreport.cpp"],

cmds/bugreportz/Android.bp

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

// bugreportz

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

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

package {

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

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

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_native_license"],

}



cc_binary {

cc_binary {

    name: "bugreportz",

    name: "bugreportz",

cmds/cmd/Android.bp

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

    default_applicable_licenses: ["frameworks_native_cmds_cmd_license"],

}



// Added automatically by a large-scale-change

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

license {

    name: "frameworks_native_cmds_cmd_license",

    visibility: [":__subpackages__"],

    license_kinds: [

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

    ],

    license_text: [

        "NOTICE",

    ],

}



cc_library_static {

cc_library_static {

    name: "libcmd",

    name: "libcmd",