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

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

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

parents 4c325e95 f84491a4

data/etc/Android.bp

+10 −1
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_native_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_native_license"],

}



prebuilt_etc {

    name: "android.hardware.biometrics.face.xml",

    product_specific: true,

libs/attestation/Android.bp

+10 −1
Original line number Diff line number Diff line
@@ -11,6 +11,15 @@ 
// 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.

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_library_static {

    name: "libattestation",

    cflags: [

libs/attestation/tests/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_native_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_native_license"],

}



cc_test {

    name: "libattestation_tests",

    test_suites: ["device-tests"],

libs/ftl/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_native_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_native_license"],

}



cc_test {

    name: "ftl_test",

    test_suites: ["device-tests"],

services/powermanager/benchmarks/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_native_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_native_license"],

}



cc_benchmark {

    name: "libpowermanager_benchmarks",

    srcs: [