diff --git a/Android.bp b/Android.bp index 2d4c42c4f40..7ac1a5dbcf0 100644 --- a/Android.bp +++ b/Android.bp @@ -1,20 +1,3 @@ -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"], diff --git a/protos/Android.bp b/protos/Android.bp index e09b941924d..5184218df63 100644 --- a/protos/Android.bp +++ b/protos/Android.bp @@ -1,12 +1,3 @@ -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, @@ -23,4 +14,4 @@ java_library_static { type: "lite", }, srcs: ["settings_log_bridge.proto"], -} +} \ No newline at end of file diff --git a/tests/anomaly-tester/Android.bp b/tests/anomaly-tester/Android.bp index c897d75fe37..29181af61ed 100644 --- a/tests/anomaly-tester/Android.bp +++ b/tests/anomaly-tester/Android.bp @@ -1,12 +1,3 @@ -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", diff --git a/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp b/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp index 1ec108a53bc..dacd32aa163 100644 --- a/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp +++ b/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp @@ -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"], diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp index c03c57f3742..1ba5d9c432a 100644 --- a/tests/perftests/Android.bp +++ b/tests/perftests/Android.bp @@ -1,12 +1,3 @@ -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", diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp index 337bad73057..af4f0d62947 100644 --- a/tests/robotests/Android.bp +++ b/tests/robotests/Android.bp @@ -2,15 +2,6 @@ // 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: [ diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp index 8636c813282..8a3e374ff43 100644 --- a/tests/uitests/Android.bp +++ b/tests/uitests/Android.bp @@ -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: "SettingsUITests", platform_apis: true, diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index b55a788988f..b857a0a92e2 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -1,12 +1,3 @@ -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: "SettingsUnitTests",