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

Commit 5739fff7 authored by Bob Badour's avatar Bob Badour
Browse files

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

This reverts commit 3908e7be.

This reverts commit c837504e.

This reverts commit 948e6aac.

Change-Id: Ib53daa5debdae7062155add5a70a5b3d5fcd1050
parent 5530dd3d

Android.bp

deleted100644 → 0
+0 −98
Original line number Diff line number Diff line 
// *** 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",

    ],

}



aidl_interface {

    name: "av-types-aidl",

    unstable: true,

    host_supported: true,

    vendor_available: true,

    double_loadable: true,

    local_include_dir: "aidl",

    srcs: [

        "aidl/android/media/InterpolatorConfig.aidl",

        "aidl/android/media/InterpolatorType.aidl",

        "aidl/android/media/MicrophoneInfoData.aidl",

        "aidl/android/media/VolumeShaperConfiguration.aidl",

        "aidl/android/media/VolumeShaperConfigurationOptionFlag.aidl",

        "aidl/android/media/VolumeShaperConfigurationType.aidl",

        "aidl/android/media/VolumeShaperOperation.aidl",

        "aidl/android/media/VolumeShaperOperationFlag.aidl",

        "aidl/android/media/VolumeShaperState.aidl",

    ],

    backend: {

        cpp: {

            min_sdk_version: "29",

            apex_available: [

                "//apex_available:platform",

                "com.android.bluetooth.updatable",

                "com.android.media",

                "com.android.media.swcodec",

            ],

        },

    },

}



cc_library_headers {

    name: "av-headers",

    export_include_dirs: ["include"],

    static_libs: [

        "av-types-aidl-cpp",

    ],

    export_static_lib_headers: [

        "av-types-aidl-cpp",

    ],

    header_libs: [

        "libaudioclient_aidl_conversion_util",

    ],

    export_header_lib_headers: [

        "libaudioclient_aidl_conversion_util",

    ],

    host_supported: true,

    vendor_available: true,

    double_loadable: true,

    min_sdk_version: "29",

    apex_available: [

        "//apex_available:platform",

        "com.android.bluetooth.updatable",

        "com.android.media",

        "com.android.media.swcodec",

    ],

    target: {

        darwin: {

            enabled: false,

        },

    },

}

apex/Android.bp

+0 −9
Original line number Diff line number Diff line
@@ -12,15 +12,6 @@ 
// 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

+0 −11
Original line number Diff line number Diff line
@@ -12,17 +12,6 @@ 
// 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

+0 −31
Original line number Diff line number Diff line
@@ -12,37 +12,6 @@ 
// 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

+0 −9
Original line number Diff line number Diff line
@@ -12,15 +12,6 @@ 
// 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",