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

Commit 0adbf158 authored by Bob Badour's avatar Bob Badour
Browse files

resolve merge conflicts of cfcf5835 to sc-dev 

Change-Id: I2134f96e3d7246e441fc1e05ca4c896b28a5d8e3
parents cb2c6bf3 cfcf5835

Android.bp

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

    default_applicable_licenses: ["packages_apps_Settings_license"],

}



// Added automatically by a large-scale-change

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

license {

    name: "packages_apps_Settings_license",

    visibility: [":__subpackages__"],

    license_kinds: [

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

    ],

    license_text: [

        "NOTICE",

    ],

}



java_library {

    name: "settings-logtags",

    srcs: ["src/**/*.logtags"],

protos/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 "packages_apps_Settings_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["packages_apps_Settings_license"],

}



java_library_static {

    name: "settings-contextual-card-protos-lite",

    host_supported: true,

tests/anomaly-tester/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 "packages_apps_Settings_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["packages_apps_Settings_license"],

}



android_test {

    name: "AnomalyTester",

tests/perftests/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 "packages_apps_Settings_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["packages_apps_Settings_license"],

}



android_test {

    name: "SettingsPerfTests",

tests/robotests/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -2,6 +2,15 @@ 
// Build SettingsRoboTestStub.apk which includes test-only resources.#

//############################################################



package {

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

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

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["packages_apps_Settings_license"],

}



android_app {

    name: "SettingsRoboTestStub",

    defaults: [