Revert "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings"
This reverts commit 0e73d05c74
.
Change-Id: I627be6c5355eda9602b1cb201806fce4548fc951
This commit is contained in:
17
Android.bp
17
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 {
|
java_library {
|
||||||
name: "settings-logtags",
|
name: "settings-logtags",
|
||||||
srcs: ["src/**/*.logtags"],
|
srcs: ["src/**/*.logtags"],
|
||||||
|
@@ -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 {
|
java_library_static {
|
||||||
name: "settings-contextual-card-protos-lite",
|
name: "settings-contextual-card-protos-lite",
|
||||||
host_supported: true,
|
host_supported: true,
|
||||||
@@ -23,4 +14,4 @@ java_library_static {
|
|||||||
type: "lite",
|
type: "lite",
|
||||||
},
|
},
|
||||||
srcs: ["settings_log_bridge.proto"],
|
srcs: ["settings_log_bridge.proto"],
|
||||||
}
|
}
|
@@ -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 {
|
android_test {
|
||||||
name: "AnomalyTester",
|
name: "AnomalyTester",
|
||||||
|
|
||||||
|
@@ -12,15 +12,6 @@
|
|||||||
// See the License for the specific language governing permissions and
|
// See the License for the specific language governing permissions and
|
||||||
// limitations under the License.
|
// 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 {
|
android_test {
|
||||||
name: "InstrumentedEntitlementApp",
|
name: "InstrumentedEntitlementApp",
|
||||||
srcs: ["src/**/*.java"],
|
srcs: ["src/**/*.java"],
|
||||||
|
@@ -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 {
|
android_test {
|
||||||
name: "SettingsPerfTests",
|
name: "SettingsPerfTests",
|
||||||
|
|
||||||
|
@@ -2,15 +2,6 @@
|
|||||||
// Build SettingsRoboTestStub.apk which includes test-only resources.#
|
// 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 {
|
android_app {
|
||||||
name: "SettingsRoboTestStub",
|
name: "SettingsRoboTestStub",
|
||||||
defaults: [
|
defaults: [
|
||||||
|
@@ -12,15 +12,6 @@
|
|||||||
// See the License for the specific language governing permissions and
|
// See the License for the specific language governing permissions and
|
||||||
// limitations under the License.
|
// 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 {
|
android_test {
|
||||||
name: "SettingsUITests",
|
name: "SettingsUITests",
|
||||||
platform_apis: true,
|
platform_apis: true,
|
||||||
|
@@ -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 {
|
android_test {
|
||||||
name: "SettingsUnitTests",
|
name: "SettingsUnitTests",
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user