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

Commit 99de5032 authored by Bob Badour's avatar Bob Badour Committed by Android (Google) Code Review
Browse files

Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av" into sc-dev

parents 0bb7c358 3908e7be

media/audioserver/Android.bp

+9 −0
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 "frameworks_av_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_av_license"],

}



cc_binary {

    name: "audioserver",

media/codec2/hidl/plugin/Android.bp

+9 −0
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 "frameworks_av_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_av_license"],

}



cc_library_headers {

    name: "libcodec2_hidl_plugin_headers",

    vendor_available: true,

media/codec2/hidl/plugin/samples/Android.bp

+9 −0
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 "frameworks_av_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_av_license"],

}



cc_defaults {

    name: "sample-codec2-hidl-plugin-defaults",

media/libaudioclient/fuzzer/Android.bp

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

}



cc_fuzz {

    name: "audioflinger_fuzzer",

    srcs: [

media/libeffects/hapticgenerator/Android.bp

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



// HapticGenerator library

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

}



cc_library_shared {

    name: "libhapticgenerator",
@@ -48,4 +57,3 @@ cc_library_shared { 
        "libaudioeffects",

    ],

}