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

Commit 6fe06b50 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "resolve merge conflicts of 5c715dd6 to... 

Merge "resolve merge conflicts of 5c715dd6 to sc-dev" into sc-dev am: a593d0a7

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13661371

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f8384e81e7f5e2e6b70e06f9ae2bbb0c4fc0f88
parents 35d26d76 a593d0a7

Android.bp

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

    default_applicable_licenses: ["hardware_interfaces_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: "hardware_interfaces_license",

    visibility: [":__subpackages__"],

    license_kinds: [

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

        "SPDX-license-identifier-NCSA",

    ],

    license_text: [

        "NOTICE",

    ],

}



hidl_package_root {

    name: "android.hardware",

    use_current: true,

atrace/1.0/Android.bp

+9 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen -Landroidbp.



package {

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

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

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["hardware_interfaces_license"],

}



hidl_interface {

    name: "android.hardware.atrace@1.0",

    root: "android.hardware",

atrace/1.0/default/Android.bp

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["hardware_interfaces_license"],

}



cc_binary {

    name: "android.hardware.atrace@1.0-service",

    defaults: ["hidl_defaults"],

atrace/1.0/vts/functional/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 "hardware_interfaces_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["hardware_interfaces_license"],

}



cc_test {

    name: "VtsHalAtraceV1_0TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],

audio/2.0/Android.bp

+9 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen -Landroidbp.



package {

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

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

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["hardware_interfaces_license"],

}



hidl_interface {

    name: "android.hardware.audio@2.0",

    root: "android.hardware",