diff options
84 files changed, 1 insertions, 936 deletions
diff --git a/ANRdaemon/Android.bp b/ANRdaemon/Android.bp index b5b9a5f6..9bb9b71e 100644 --- a/ANRdaemon/Android.bp +++ b/ANRdaemon/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 "system_extras_license" - // to get the below license kinds: - // SPDX-license-identifier-BSD - default_applicable_licenses: ["system_extras_license"], -} - cc_binary { name: "anrd", srcs: ["ANRdaemon.cpp"], diff --git a/Android.bp b/Android.bp deleted file mode 100644 index f3a31ebe..00000000 --- a/Android.bp +++ /dev/null @@ -1,43 +0,0 @@ -// -// Copyright (C) 2021 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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 { - default_applicable_licenses: ["system_extras_license"], -} - -// Added automatically by a large-scale-change that took the approach of -// 'apply every license found to every target'. While this makes sure we respect -// every license restriction, it may not be entirely correct. -// -// e.g. GPL in an MIT project might only apply to the contrib/ directory. -// -// Please consider splitting the single license below into multiple licenses, -// taking care not to lose any license_kind information, and overriding the -// default license using the 'licenses: [...]' property on targets as needed. -// -// For unused files, consider creating a 'fileGroup' with "//visibility:private" -// to attach the license to, and including a comment whether the files may be -// used in the current project. -// See: http://go/android-license-faq -license { - name: "system_extras_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-BSD", - "legacy_notice", - ], - // large-scale-change unable to identify any license_text files -} diff --git a/alloc-stress/Android.bp b/alloc-stress/Android.bp index 5661b3bd..30ccbdb6 100644 --- a/alloc-stress/Android.bp +++ b/alloc-stress/Android.bp @@ -14,15 +14,6 @@ // 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 "system_extras_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["system_extras_license"], -} - cc_binary { name: "alloc-stress", srcs: ["alloc-stress.cpp"], diff --git a/app-launcher/Android.bp b/app-launcher/Android.bp index 0a1bee84..bf7b2798 100644 --- a/app-launcher/Android.bp +++ b/app-launcher/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 "system_extras_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["system_extras_license"], -} - cc_defaults { name: "computestats-defaults", diff --git a/boot_control_copy/Android.bp b/boot_control_copy/Android.bp index 49126d9c..6c9dbc24 100644 --- a/boot_control_copy/Android.bp +++ b/boot_control_copy/Android.bp @@ -1,22 +1,5 @@ // Copyright 2015 The Android Open Source Project -package { - default_applicable_licenses: ["system_extras_boot_control_copy_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_boot_control_copy_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_library_shared { name: "bootctrl.copy", relative_install_path: "hw", diff --git a/bootctl/Android.bp b/bootctl/Android.bp index f63871cf..8843b946 100644 --- a/bootctl/Android.bp +++ b/bootctl/Android.bp @@ -1,22 +1,5 @@ // Copyright 2015 The Android Open Source Project -package { - default_applicable_licenses: ["system_extras_bootctl_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_bootctl_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "bootctl", srcs: ["bootctl.cpp"], diff --git a/boottime_tools/bootanalyze/stressfs/Android.bp b/boottime_tools/bootanalyze/stressfs/Android.bp index c0dee353..f342d1aa 100644 --- a/boottime_tools/bootanalyze/stressfs/Android.bp +++ b/boottime_tools/bootanalyze/stressfs/Android.bp @@ -14,10 +14,6 @@ // // -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - android_test { name: "StressFS", srcs: ["src/**/*.java"], diff --git a/boottime_tools/bootio/Android.bp b/boottime_tools/bootio/Android.bp index bf071163..7c8ef269 100644 --- a/boottime_tools/bootio/Android.bp +++ b/boottime_tools/bootio/Android.bp @@ -14,10 +14,6 @@ // limitations under the License. // -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - cc_defaults { name: "bootio_defaults", diff --git a/brillo_config/Android.mk b/brillo_config/Android.mk index b8cad2f7..cefc0826 100644 --- a/brillo_config/Android.mk +++ b/brillo_config/Android.mk @@ -20,8 +20,6 @@ ifdef OSRELEASED_DIRECTORY include $(CLEAR_VARS) LOCAL_MODULE := product_id -LOCAL_LICENSE_KINDS := legacy_notice -LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_CLASS := FAKE LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/$(OSRELEASED_DIRECTORY) include $(BUILD_SYSTEM)/base_rules.mk @@ -34,8 +32,6 @@ $(LOCAL_BUILT_MODULE): include $(CLEAR_VARS) LOCAL_MODULE := system_id -LOCAL_LICENSE_KINDS := legacy_notice -LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY) include $(BUILD_SYSTEM)/base_rules.mk @@ -47,8 +43,6 @@ $(LOCAL_BUILT_MODULE): include $(CLEAR_VARS) LOCAL_MODULE := product_version -LOCAL_LICENSE_KINDS := legacy_notice -LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_CLASS := FAKE LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/$(OSRELEASED_DIRECTORY) include $(BUILD_SYSTEM)/base_rules.mk @@ -70,8 +64,6 @@ $(LOCAL_BUILT_MODULE): include $(CLEAR_VARS) LOCAL_MODULE := system_version -LOCAL_LICENSE_KINDS := legacy_notice -LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY) include $(BUILD_SYSTEM)/base_rules.mk diff --git a/checkpoint_gc/Android.bp b/checkpoint_gc/Android.bp index fcdaf5c0..fac9c6a8 100644 --- a/checkpoint_gc/Android.bp +++ b/checkpoint_gc/Android.bp @@ -1,8 +1,4 @@ // Checkpointing GC script -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - sh_binary { name: "checkpoint_gc", src: "checkpoint_gc.sh", diff --git a/cppreopts/Android.bp b/cppreopts/Android.bp index 70d349d5..9e9c4a11 100644 --- a/cppreopts/Android.bp +++ b/cppreopts/Android.bp @@ -14,10 +14,6 @@ // limitations under the License. // -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - sh_binary { name: "preloads_copy.sh", diff --git a/cpustats/Android.bp b/cpustats/Android.bp index db3aae51..6b0229be 100644 --- a/cpustats/Android.bp +++ b/cpustats/Android.bp @@ -1,33 +1,3 @@ -package { - default_applicable_licenses: ["system_extras_cpustats_license"], -} - -// Added automatically by a large-scale-change that took the approach of -// 'apply every license found to every target'. While this makes sure we respect -// every license restriction, it may not be entirely correct. -// -// e.g. GPL in an MIT project might only apply to the contrib/ directory. -// -// Please consider splitting the single license below into multiple licenses, -// taking care not to lose any license_kind information, and overriding the -// default license using the 'licenses: [...]' property on targets as needed. -// -// For unused files, consider creating a 'fileGroup' with "//visibility:private" -// to attach the license to, and including a comment whether the files may be -// used in the current project. -// See: http://go/android-license-faq -license { - name: "system_extras_cpustats_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-BSD", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "cpustats", srcs: ["cpustats.c"], diff --git a/crypto-perf/Android.bp b/crypto-perf/Android.bp index 8f575ca9..60116891 100644 --- a/crypto-perf/Android.bp +++ b/crypto-perf/Android.bp @@ -1,20 +1,3 @@ -package { - default_applicable_licenses: ["system_extras_crypto-perf_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_crypto-perf_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "crypto", diff --git a/ext4_utils/Android.bp b/ext4_utils/Android.bp index 10aa765f..d528d2ca 100644 --- a/ext4_utils/Android.bp +++ b/ext4_utils/Android.bp @@ -1,22 +1,5 @@ // Copyright 2010 The Android Open Source Project -package { - default_applicable_licenses: ["system_extras_ext4_utils_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_ext4_utils_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_library { name: "libext4_utils", host_supported: true, diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk index b55613fb..259fbd89 100644 --- a/ext4_utils/Android.mk +++ b/ext4_utils/Android.mk @@ -8,9 +8,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := mke2fs.conf -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_IS_HOST_MODULE := true diff --git a/f2fs_utils/Android.bp b/f2fs_utils/Android.bp index dc74d6d3..209c65eb 100644 --- a/f2fs_utils/Android.bp +++ b/f2fs_utils/Android.bp @@ -1,22 +1,5 @@ // Copyright 2017 The Android Open Source Project -package { - default_applicable_licenses: ["system_extras_f2fs_utils_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_f2fs_utils_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_library_shared { name: "libf2fs_sparseblock", cflags: ["-Werror"], diff --git a/ioblame/Android.bp b/ioblame/Android.bp index 119ef76e..4b0fa711 100644 --- a/ioblame/Android.bp +++ b/ioblame/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 "system_extras_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["system_extras_license"], -} - sh_binary_host { name: "ioblame", src: "ioblame.sh", diff --git a/ioshark/Android.bp b/ioshark/Android.bp index 02952a35..0f9ba29b 100644 --- a/ioshark/Android.bp +++ b/ioshark/Android.bp @@ -12,10 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - cc_defaults { name: "ioshark_defaults", diff --git a/iotop/Android.bp b/iotop/Android.bp index d7dc3ea0..9b5e40cc 100644 --- a/iotop/Android.bp +++ b/iotop/Android.bp @@ -12,23 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -package { - default_applicable_licenses: ["system_extras_iotop_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_iotop_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "iotop", diff --git a/kexec_tools/Android.bp b/kexec_tools/Android.bp index d5b4af30..bcfc2ee6 100644 --- a/kexec_tools/Android.bp +++ b/kexec_tools/Android.bp @@ -13,23 +13,6 @@ // limitations under the License. // Copyright The Android Open Source Project -package { - default_applicable_licenses: ["system_extras_kexec_tools_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_kexec_tools_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "kexecload", srcs: ["kexecload.c"], diff --git a/latencytop/Android.bp b/latencytop/Android.bp index 64a3c20d..fab36312 100644 --- a/latencytop/Android.bp +++ b/latencytop/Android.bp @@ -12,23 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -package { - default_applicable_licenses: ["system_extras_latencytop_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_latencytop_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "latencytop", diff --git a/libfec/Android.bp b/libfec/Android.bp index 6bd44dd9..3da6fe7c 100644 --- a/libfec/Android.bp +++ b/libfec/Android.bp @@ -1,22 +1,5 @@ // Copyright 2015 The Android Open Source Project -package { - default_applicable_licenses: ["system_extras_libfec_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_libfec_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_defaults { name: "libfec_default", diff --git a/libfec/test/Android.bp b/libfec/test/Android.bp index 6f412a26..60879c1a 100644 --- a/libfec/test/Android.bp +++ b/libfec/test/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 "system_extras_libfec_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_libfec_license"], -} - cc_defaults { name: "fec_test_defaults", diff --git a/libfscrypt/Android.bp b/libfscrypt/Android.bp index afdc7f4e..65b94ed9 100644 --- a/libfscrypt/Android.bp +++ b/libfscrypt/Android.bp @@ -1,22 +1,5 @@ // Copyright 2018 The Android Open Source Project -package { - default_applicable_licenses: ["system_extras_libfscrypt_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_libfscrypt_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_library { name: "libfscrypt", recovery_available: true, diff --git a/libfscrypt/tests/Android.bp b/libfscrypt/tests/Android.bp index c630fc6d..985b425f 100644 --- a/libfscrypt/tests/Android.bp +++ b/libfscrypt/tests/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 "system_extras_libfscrypt_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_libfscrypt_license"], -} - cc_test { name: "libfscrypt_unit_test", diff --git a/libjsonpb/parse/Android.bp b/libjsonpb/parse/Android.bp index ddb95128..eaec342a 100644 --- a/libjsonpb/parse/Android.bp +++ b/libjsonpb/parse/Android.bp @@ -15,10 +15,6 @@ // A convenient library to convert any JSON string to a specific Protobuf // message using reflection. -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - cc_library_static { name: "libjsonpbparse", host_supported: true, diff --git a/libjsonpb/verify/Android.bp b/libjsonpb/verify/Android.bp index a6641855..74e9eca4 100644 --- a/libjsonpb/verify/Android.bp +++ b/libjsonpb/verify/Android.bp @@ -15,10 +15,6 @@ // This static library defines parameterized tests that enforce additional restrictions when // using Protobuf as schema for JSON files. The reason is that the JSON parser that // libprotobuf-cpp-full provides is relatively relaxed. -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - cc_library_static { name: "libjsonpbverify", host_supported: true, diff --git a/memory_replay/Android.bp b/memory_replay/Android.bp index 8fb9dbc1..ab5a380f 100644 --- a/memory_replay/Android.bp +++ b/memory_replay/Android.bp @@ -14,23 +14,6 @@ // limitations under the License. // -package { - default_applicable_licenses: ["system_extras_memory_replay_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_memory_replay_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_defaults { name: "memory_flag_defaults", host_supported: false, diff --git a/memtrack/Android.bp b/memtrack/Android.bp index d04c6ffa..457140e9 100644 --- a/memtrack/Android.bp +++ b/memtrack/Android.bp @@ -12,23 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -package { - default_applicable_licenses: ["system_extras_memtrack_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_memtrack_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_defaults { name: "memtrack_defaults", diff --git a/mmap-perf/Android.bp b/mmap-perf/Android.bp index d989e5fe..4841bee1 100644 --- a/mmap-perf/Android.bp +++ b/mmap-perf/Android.bp @@ -14,23 +14,6 @@ // limitations under the License. // -package { - default_applicable_licenses: ["system_extras_mmap-perf_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_mmap-perf_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_benchmark { name: "mmapPerf", diff --git a/module_ndk_libs/libnativehelper/Android.bp b/module_ndk_libs/libnativehelper/Android.bp index 43043738..34945e9c 100644 --- a/module_ndk_libs/libnativehelper/Android.bp +++ b/module_ndk_libs/libnativehelper/Android.bp @@ -16,25 +16,6 @@ // platform/libnativehelper project in the ART branch. Any changes here should // be synced here and vice versa. -package { - default_applicable_licenses: [ - "system_extras_module_ndk_libs_libnativehelper_license", - ], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_module_ndk_libs_libnativehelper_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - ndk_headers { name: "ndk_jni.h", from: "include_jni", diff --git a/multinetwork/Android.bp b/multinetwork/Android.bp index 06c4b346..e2b4be0e 100644 --- a/multinetwork/Android.bp +++ b/multinetwork/Android.bp @@ -1,7 +1,3 @@ -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - cc_defaults { name: "multinetwork_defaults", diff --git a/pagecache/Android.bp b/pagecache/Android.bp index c53f75bb..40fc4449 100644 --- a/pagecache/Android.bp +++ b/pagecache/Android.bp @@ -1,22 +1,5 @@ // Copyright 2015 The Android Open Source Project -package { - default_applicable_licenses: ["system_extras_pagecache_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_pagecache_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "dumpcache", diff --git a/partition_tools/Android.bp b/partition_tools/Android.bp index eb886327..a05f5e4e 100644 --- a/partition_tools/Android.bp +++ b/partition_tools/Android.bp @@ -14,10 +14,6 @@ // limitations under the License. // -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - cc_defaults { name: "lp_defaults", cflags: [ diff --git a/partition_tools/aidl/Android.bp b/partition_tools/aidl/Android.bp index 0448631f..f031150f 100644 --- a/partition_tools/aidl/Android.bp +++ b/partition_tools/aidl/Android.bp @@ -14,15 +14,6 @@ // 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 "system_extras_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["system_extras_license"], -} - aidl_interface { name: "liblpdump_interface", unstable: true, diff --git a/perf2cfg/Android.bp b/perf2cfg/Android.bp index d88dcbda..4611f7ec 100644 --- a/perf2cfg/Android.bp +++ b/perf2cfg/Android.bp @@ -12,10 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - python_library_host { name: "perf2cfg_library", srcs: [ diff --git a/postinst/Android.bp b/postinst/Android.bp index 89141893..25e9dfe4 100644 --- a/postinst/Android.bp +++ b/postinst/Android.bp @@ -14,23 +14,6 @@ // limitations under the License. // -package { - default_applicable_licenses: ["system_extras_postinst_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_postinst_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - sh_binary { name: "postinst_example", src: "postinst.sh", diff --git a/preopt2cachename/Android.bp b/preopt2cachename/Android.bp index 54e8e2e1..63fea15d 100644 --- a/preopt2cachename/Android.bp +++ b/preopt2cachename/Android.bp @@ -12,10 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - cc_binary { name: "preopt2cachename", diff --git a/profcollectd/Android.bp b/profcollectd/Android.bp index cd0d8852..16ffb54a 100644 --- a/profcollectd/Android.bp +++ b/profcollectd/Android.bp @@ -14,23 +14,6 @@ // limitations under the License. // -package { - default_applicable_licenses: ["system_extras_profcollectd_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_profcollectd_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - rust_binary { name: "profcollectctl", diff --git a/profcollectd/libprofcollectd/Android.bp b/profcollectd/libprofcollectd/Android.bp index dc09889c..e1491b76 100644 --- a/profcollectd/libprofcollectd/Android.bp +++ b/profcollectd/libprofcollectd/Android.bp @@ -14,15 +14,6 @@ // 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 "system_extras_profcollectd_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_profcollectd_license"], -} - aidl_interface { name: "profcollectd_aidl_interface", unstable: true, diff --git a/profcollectd/libprofcollectd/bindings/libflags/Android.bp b/profcollectd/libprofcollectd/bindings/libflags/Android.bp index f7cf2ed9..9fd08551 100644 --- a/profcollectd/libprofcollectd/bindings/libflags/Android.bp +++ b/profcollectd/libprofcollectd/bindings/libflags/Android.bp @@ -14,15 +14,6 @@ // 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 "system_extras_profcollectd_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_profcollectd_license"], -} - cc_library_static { name: "libprofcollect_libflags", srcs: ["get_flags.cpp"], diff --git a/pssbench/Android.mk b/pssbench/Android.mk index 03e22a13..45bab557 100644 --- a/pssbench/Android.mk +++ b/pssbench/Android.mk @@ -3,8 +3,6 @@ include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/local/tmp LOCAL_MODULE:= pssbench -LOCAL_LICENSE_KINDS:= legacy_notice -LOCAL_LICENSE_CONDITIONS:= notice LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := EXECUTABLES diff --git a/puncture_fs/Android.bp b/puncture_fs/Android.bp index aef7ba43..5c163372 100644 --- a/puncture_fs/Android.bp +++ b/puncture_fs/Android.bp @@ -12,23 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -package { - default_applicable_licenses: ["system_extras_puncture_fs_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_puncture_fs_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "puncture_fs", diff --git a/runconuid/Android.bp b/runconuid/Android.bp index ceea3ff3..59fb9ca1 100644 --- a/runconuid/Android.bp +++ b/runconuid/Android.bp @@ -1,20 +1,3 @@ -package { - default_applicable_licenses: ["system_extras_runconuid_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_runconuid_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "runconuid", diff --git a/sane_schedstat/Android.bp b/sane_schedstat/Android.bp index 9be0d4e3..68adc743 100644 --- a/sane_schedstat/Android.bp +++ b/sane_schedstat/Android.bp @@ -1,20 +1,3 @@ -package { - default_applicable_licenses: ["system_extras_sane_schedstat_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_sane_schedstat_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "sane_schedstat", diff --git a/showslab/Android.bp b/showslab/Android.bp index 27a71c43..d84004e5 100644 --- a/showslab/Android.bp +++ b/showslab/Android.bp @@ -1,22 +1,5 @@ // Copyright 2007 The Android Open Source Project -package { - default_applicable_licenses: ["system_extras_showslab_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_showslab_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "showslab", diff --git a/simpleperf/Android.bp b/simpleperf/Android.bp index 62195b5c..eac33ad5 100644 --- a/simpleperf/Android.bp +++ b/simpleperf/Android.bp @@ -14,23 +14,6 @@ // limitations under the License. // -package { - default_applicable_licenses: ["system_extras_simpleperf_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_simpleperf_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_defaults { name: "libsimpleperf_elf_read_static_reqs_defaults", static_libs: [ diff --git a/simpleperf/runtest/Android.bp b/simpleperf/runtest/Android.bp index dee4ffd8..c50d7e0a 100644 --- a/simpleperf/runtest/Android.bp +++ b/simpleperf/runtest/Android.bp @@ -14,15 +14,6 @@ // 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 "system_extras_simpleperf_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_simpleperf_license"], -} - cc_defaults { name: "simpleperf_runtest_defaults", host_supported: true, diff --git a/simpleperf/scripts/inferno/Android.bp b/simpleperf/scripts/inferno/Android.bp index 14d18778..99a111c3 100644 --- a/simpleperf/scripts/inferno/Android.bp +++ b/simpleperf/scripts/inferno/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 "system_extras_simpleperf_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_simpleperf_license"], -} - python_library_host { name: "simpleperf-inferno", srcs: [ diff --git a/simpleperf/simpleperf_app_runner/Android.bp b/simpleperf/simpleperf_app_runner/Android.bp index 3179f397..cd93505d 100644 --- a/simpleperf/simpleperf_app_runner/Android.bp +++ b/simpleperf/simpleperf_app_runner/Android.bp @@ -14,15 +14,6 @@ // 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 "system_extras_simpleperf_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_simpleperf_license"], -} - cc_binary { name: "simpleperf_app_runner", srcs: [ diff --git a/slideshow/Android.mk b/slideshow/Android.mk index 42d6719e..192e64fb 100644 --- a/slideshow/Android.mk +++ b/slideshow/Android.mk @@ -5,9 +5,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := slideshow.cpp LOCAL_MODULE := slideshow -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := -D__STDC_LIMIT_MACROS -Werror diff --git a/sound/Android.bp b/sound/Android.bp index 2b0e5f98..9c6b1905 100644 --- a/sound/Android.bp +++ b/sound/Android.bp @@ -1,20 +1,3 @@ -package { - default_applicable_licenses: ["system_extras_sound_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_sound_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "sound", srcs: ["playwav.c"], diff --git a/squashfs_utils/Android.bp b/squashfs_utils/Android.bp index 4a6fb5fa..c4c675c3 100644 --- a/squashfs_utils/Android.bp +++ b/squashfs_utils/Android.bp @@ -1,22 +1,5 @@ // Copyright 2015 The Android Open Source Project -package { - default_applicable_licenses: ["system_extras_squashfs_utils_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_squashfs_utils_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_library { name: "libsquashfs_utils", cflags: ["-Werror"], diff --git a/su/Android.mk b/su/Android.mk index 18493992..fd8df768 100644 --- a/su/Android.mk +++ b/su/Android.mk @@ -6,9 +6,6 @@ LOCAL_CFLAGS := -Wall -Werror LOCAL_SRC_FILES:= su.cpp LOCAL_MODULE:= su -LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS:= notice -LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE LOCAL_HEADER_LIBRARIES := libcutils_headers diff --git a/taskstats/Android.bp b/taskstats/Android.bp index ad9f88ce..3f2a5732 100644 --- a/taskstats/Android.bp +++ b/taskstats/Android.bp @@ -1,22 +1,5 @@ // Copyright 2013 The Android Open Source Project -package { - default_applicable_licenses: ["system_extras_taskstats_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_taskstats_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "taskstats", diff --git a/tests/Android.bp b/tests/Android.bp deleted file mode 100644 index af3b8b2f..00000000 --- a/tests/Android.bp +++ /dev/null @@ -1,31 +0,0 @@ -// -// Copyright (C) 2021 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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 { - default_applicable_licenses: ["system_extras_tests_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_tests_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} diff --git a/tests/audio/alsa/Android.bp b/tests/audio/alsa/Android.bp index 87c66452..60dbe87e 100644 --- a/tests/audio/alsa/Android.bp +++ b/tests/audio/alsa/Android.bp @@ -14,15 +14,6 @@ // 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 "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_test { name: "pcmtest", srcs: ["pcmtest.cpp"], diff --git a/tests/binder/benchmarks/Android.bp b/tests/binder/benchmarks/Android.bp index 6a550688..5ac0895a 100644 --- a/tests/binder/benchmarks/Android.bp +++ b/tests/binder/benchmarks/Android.bp @@ -14,15 +14,6 @@ // 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 "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_benchmark { name: "binderAddInts", diff --git a/tests/bootloader/Android.mk b/tests/bootloader/Android.mk index a5421a50..ab311fdc 100644 --- a/tests/bootloader/Android.mk +++ b/tests/bootloader/Android.mk @@ -6,9 +6,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := bootloader_unit_test -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_MODULE_TAGS := tests bootloader_py_files := $(call find-subdir-files, *.py) diff --git a/tests/cpueater/Android.bp b/tests/cpueater/Android.bp index 72c0e49b..315a18b0 100644 --- a/tests/cpueater/Android.bp +++ b/tests/cpueater/Android.bp @@ -13,23 +13,6 @@ // limitations under the License. // Copyright The Android Open Source Project -package { - default_applicable_licenses: ["system_extras_tests_cpueater_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_tests_cpueater_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "cpueater", srcs: ["cpueater.c"], diff --git a/tests/crypto/Android.bp b/tests/crypto/Android.bp index d0326d47..61cb8299 100644 --- a/tests/crypto/Android.bp +++ b/tests/crypto/Android.bp @@ -1,14 +1,5 @@ // Copyright 2013 The Android Open Source Project -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_binary { name: "get_dm_versions", srcs: ["get_dm_versions.c"], diff --git a/tests/directiotest/Android.bp b/tests/directiotest/Android.bp index ab2545ce..489e3c82 100644 --- a/tests/directiotest/Android.bp +++ b/tests/directiotest/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 "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_binary { name: "directiotest", srcs: ["directiotest.c"], diff --git a/tests/ext4/Android.mk b/tests/ext4/Android.mk index 0a384842..a9a684d2 100644 --- a/tests/ext4/Android.mk +++ b/tests/ext4/Android.mk @@ -7,9 +7,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= rand_emmc_perf.c LOCAL_CFLAGS := -Wall -Werror LOCAL_MODULE:= rand_emmc_perf -LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS:= notice -LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/../NOTICE LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32:= rand_emmc_perf LOCAL_MODULE_STEM_64:= rand_emmc_perf64 @@ -19,3 +16,4 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_STATIC_LIBRARIES := libm libc include $(BUILD_EXECUTABLE) + diff --git a/tests/framebuffer/Android.bp b/tests/framebuffer/Android.bp index eda69dec..f072a59a 100644 --- a/tests/framebuffer/Android.bp +++ b/tests/framebuffer/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 "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_binary { name: "test-fb-refresh", srcs: ["refresh.c"], diff --git a/tests/fstest/Android.bp b/tests/fstest/Android.bp index 8c9ce68e..febbb2f7 100644 --- a/tests/fstest/Android.bp +++ b/tests/fstest/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 "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_test { name: "recovery_test", srcs: ["recovery_test.cpp"], diff --git a/tests/icachetest/Android.bp b/tests/icachetest/Android.bp index 4e9d0d05..e8c72855 100644 --- a/tests/icachetest/Android.bp +++ b/tests/icachetest/Android.bp @@ -1,14 +1,5 @@ // Copyright 2006 The Android Open Source Project -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_binary { name: "icache", diff --git a/tests/iptables/qtaguid/Android.bp b/tests/iptables/qtaguid/Android.bp index 935c0b41..9c853c8b 100644 --- a/tests/iptables/qtaguid/Android.bp +++ b/tests/iptables/qtaguid/Android.bp @@ -14,15 +14,6 @@ // 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 "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_test { name: "socketTag", srcs: ["socketTag.cpp"], diff --git a/tests/kernel.config/Android.mk b/tests/kernel.config/Android.mk index cff19bac..a622bf56 100644 --- a/tests/kernel.config/Android.mk +++ b/tests/kernel.config/Android.mk @@ -31,9 +31,6 @@ test_src_files := \ include $(CLEAR_VARS) LOCAL_MODULE := kernel-config-unit-tests -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_MODULE_TAGS := tests LOCAL_CFLAGS := $(test_c_flags) LOCAL_CFLAGS += -DHAS_KCMP @@ -43,9 +40,6 @@ include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) LOCAL_MODULE := CtsKernelConfigTestCases -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(test_c_flags) LOCAL_CFLAGS += -DHAS_KCMP @@ -66,8 +60,5 @@ LOCAL_SRC_FILES := \ scrape_mmap_addr.cpp LOCAL_MODULE := scrape_mmap_addr -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_CFLAGS := -Wall -Werror include $(BUILD_NATIVE_TEST) diff --git a/tests/lib/Android.bp b/tests/lib/Android.bp index f41419e3..b44c2960 100644 --- a/tests/lib/Android.bp +++ b/tests/lib/Android.bp @@ -1,10 +1 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - subdirs = ["*"] diff --git a/tests/lib/testUtil/Android.bp b/tests/lib/testUtil/Android.bp index 39fad294..a5a3f517 100644 --- a/tests/lib/testUtil/Android.bp +++ b/tests/lib/testUtil/Android.bp @@ -14,15 +14,6 @@ // 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 "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_library_static { name: "libtestUtil", srcs: ["testUtil.c"], diff --git a/tests/memeater/Android.mk b/tests/memeater/Android.mk index e22da649..a07564ab 100644 --- a/tests/memeater/Android.mk +++ b/tests/memeater/Android.mk @@ -17,9 +17,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := memeater -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) LOCAL_SRC_FILES := memeater.c LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter diff --git a/tests/pagingtest/Android.mk b/tests/pagingtest/Android.mk index 69fea9d0..de952ce3 100644 --- a/tests/pagingtest/Android.mk +++ b/tests/pagingtest/Android.mk @@ -9,9 +9,6 @@ LOCAL_SRC_FILES:= \ thrashing_test.c LOCAL_MODULE:= pagingtest -LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS:= notice -LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/../NOTICE LOCAL_CFLAGS := -Wall -Werror diff --git a/tests/pftest/Android.bp b/tests/pftest/Android.bp index 2a9ef6ba..dcd8b5b9 100644 --- a/tests/pftest/Android.bp +++ b/tests/pftest/Android.bp @@ -1,14 +1,5 @@ // Copyright 2010 The Android Open Source Project -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_binary { name: "pftest", diff --git a/tests/schedtest/Android.bp b/tests/schedtest/Android.bp index ac10b117..28ece031 100644 --- a/tests/schedtest/Android.bp +++ b/tests/schedtest/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 "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_binary { name: "schedtest", srcs: ["schedtest.c"], diff --git a/tests/storage/Android.bp b/tests/storage/Android.bp index 9bbd24ea..ba9bf1fe 100644 --- a/tests/storage/Android.bp +++ b/tests/storage/Android.bp @@ -1,14 +1,5 @@ // Copyright 2013 The Android Open Source Project -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_binary { name: "opentest", srcs: ["opentest.c"], diff --git a/tests/suspend_stress/Android.bp b/tests/suspend_stress/Android.bp index bceff117..e7a0d94c 100644 --- a/tests/suspend_stress/Android.bp +++ b/tests/suspend_stress/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 "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_binary { name: "suspend_stress", srcs: ["suspend_stress.cpp"], diff --git a/tests/tcp_nuke_addr/Android.bp b/tests/tcp_nuke_addr/Android.bp index 1a504395..316fd3a1 100644 --- a/tests/tcp_nuke_addr/Android.bp +++ b/tests/tcp_nuke_addr/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 "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_test { name: "tcp_nuke_addr_test", srcs: ["tcp_nuke_addr_test.cpp"], diff --git a/tests/timetest/Android.bp b/tests/timetest/Android.bp index c4f361cb..481610b7 100644 --- a/tests/timetest/Android.bp +++ b/tests/timetest/Android.bp @@ -1,14 +1,5 @@ // Copyright 2006 The Android Open Source Project -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_test { name: "time-unit-tests", cflags: [ diff --git a/tests/uevents/Android.bp b/tests/uevents/Android.bp index 4548b456..a292ebcf 100644 --- a/tests/uevents/Android.bp +++ b/tests/uevents/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 "system_extras_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_tests_license"], -} - cc_binary { name: "uevents", srcs: ["uevents.c"], diff --git a/toolchain-extras/Android.bp b/toolchain-extras/Android.bp index 007817ec..ad1c4791 100644 --- a/toolchain-extras/Android.bp +++ b/toolchain-extras/Android.bp @@ -1,7 +1,3 @@ -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - cc_defaults { name: "libprofile-defaults", srcs: [ diff --git a/vbmeta_tools/Android.bp b/vbmeta_tools/Android.bp index 56b62b91..0e8d458d 100644 --- a/vbmeta_tools/Android.bp +++ b/vbmeta_tools/Android.bp @@ -14,10 +14,6 @@ // limitations under the License. // -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - cc_binary { name: "vbmake", host_supported: true, diff --git a/verity/Android.bp b/verity/Android.bp index fc2b827c..5d0a80c0 100644 --- a/verity/Android.bp +++ b/verity/Android.bp @@ -1,20 +1,3 @@ -package { - default_applicable_licenses: ["system_extras_verity_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_extras_verity_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary_host { name: "generate_verity_key", srcs: ["generate_verity_key.c"], diff --git a/verity/fec/Android.bp b/verity/fec/Android.bp index 46c2e465..68d44fde 100644 --- a/verity/fec/Android.bp +++ b/verity/fec/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 "system_extras_verity_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_extras_verity_license"], -} - cc_binary_host { name: "fec", diff --git a/zram-perf/Android.bp b/zram-perf/Android.bp index f4928686..7b20537a 100644 --- a/zram-perf/Android.bp +++ b/zram-perf/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 "system_extras_license" - // to get the below license kinds: - // legacy_notice - default_applicable_licenses: ["system_extras_license"], -} - cc_binary { name: "zram-perf", cflags: [ |