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

Commit 18e97234 authored by Bob Badour's avatar Bob Badour
Browse files

Revert "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" 

This reverts commit 0e73d05c.

Change-Id: I627be6c5355eda9602b1cb201806fce4548fc951
parent 4357b145

Android.bp

+0 −17
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

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

+0 −9
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/legacy_unit/InstrumentedEntitlementApp/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 "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: "InstrumentedEntitlementApp",

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

tests/perftests/Android.bp

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