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

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

Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av" am: 9e11c9b6 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1588170

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4257e4f796ae4b7d70b6bba9db5e12c0df82704
parents ca84f907 9e11c9b6

Android.bp

0 → 100644
+50 −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.



// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE

//     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE

//     DEPENDING ON IT IN YOUR PROJECT. ***

package {

    default_applicable_licenses: ["frameworks_av_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: "frameworks_av_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_by_exception_only", // by exception only

    ],

    license_text: [

        "NOTICE",

    ],

}

apex/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -12,6 +12,15 @@ 
// See the License for the specific language governing permissions and

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_av_license"],

}



apex_defaults {

    name: "com.android.media-defaults",

    updatable: true,

apex/testing/Android.bp

+11 −0
Original line number Diff line number Diff line
@@ -12,6 +12,17 @@ 
// See the License for the specific language governing permissions and

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    //   SPDX-license-identifier-MIT

    //   SPDX-license-identifier-Unicode-DFS

    default_applicable_licenses: ["frameworks_av_license"],

}



apex_test {

    name: "test_com.android.media",

    manifest: "test_manifest.json",

camera/Android.bp

+31 −0
Original line number Diff line number Diff line
@@ -12,6 +12,37 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



package {

    default_applicable_licenses: ["frameworks_av_camera_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: "frameworks_av_camera_license",

    visibility: [":__subpackages__"],

    license_kinds: [

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

        "SPDX-license-identifier-MIT",

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

    ],

    license_text: [

        "NOTICE",

    ],

}



cc_library_shared {

    name: "libcamera_client",

camera/cameraserver/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -12,6 +12,15 @@ 
// See the License for the specific language governing permissions and

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_av_camera_license"],

}



cc_binary {

    name: "cameraserver",