diff options
97 files changed, 3 insertions, 1015 deletions
diff --git a/Android.bp b/Android.bp deleted file mode 100644 index 402a828fd..000000000 --- a/Android.bp +++ /dev/null @@ -1,45 +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_core_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_core_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-BSD", - "SPDX-license-identifier-MIT", - ], - license_text: [ - "NOTICE", - ], -} diff --git a/bootstat/Android.bp b/bootstat/Android.bp index 7480e4905..5192f5e1a 100644 --- a/bootstat/Android.bp +++ b/bootstat/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - bootstat_lib_src_files = [ "boot_event_record_store.cpp", ] diff --git a/cli-test/Android.bp b/cli-test/Android.bp index 7aa6a62c2..37a1d1b37 100644 --- a/cli-test/Android.bp +++ b/cli-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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "cli-test", host_supported: true, diff --git a/code_coverage/Android.bp b/code_coverage/Android.bp index a5d70d426..b51c80288 100644 --- a/code_coverage/Android.bp +++ b/code_coverage/Android.bp @@ -1,13 +1,4 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "system_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - prebuilt_etc { name: "code_coverage.policy", sub_dir: "seccomp_policy", diff --git a/cpio/Android.bp b/cpio/Android.bp index 3b0d257d1..baa031907 100644 --- a/cpio/Android.bp +++ b/cpio/Android.bp @@ -1,14 +1,5 @@ // Copyright 2005 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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary_host { name: "mkbootfs", srcs: ["mkbootfs.c"], diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp index adf9d05e7..53f85bf32 100644 --- a/debuggerd/Android.bp +++ b/debuggerd/Android.bp @@ -1,13 +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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-BSD - default_applicable_licenses: ["system_core_license"], -} - cc_defaults { name: "debuggerd_defaults", cflags: [ diff --git a/debuggerd/crasher/Android.bp b/debuggerd/crasher/Android.bp index feb80eab2..61c539580 100644 --- a/debuggerd/crasher/Android.bp +++ b/debuggerd/crasher/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_defaults { name: "crasher-defaults", diff --git a/debuggerd/proto/Android.bp b/debuggerd/proto/Android.bp index 1c5a27061..bb82f032b 100644 --- a/debuggerd/proto/Android.bp +++ b/debuggerd/proto/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - filegroup { name: "libtombstone_proto-src", srcs: ["tombstone.proto"], diff --git a/diagnose_usb/Android.bp b/diagnose_usb/Android.bp index bd4448343..93d13bd56 100644 --- a/diagnose_usb/Android.bp +++ b/diagnose_usb/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_static { name: "libdiagnose_usb", cflags: ["-Wall", "-Wextra", "-Werror"], diff --git a/fastboot/Android.bp b/fastboot/Android.bp index fa9437ba3..85a19e589 100644 --- a/fastboot/Android.bp +++ b/fastboot/Android.bp @@ -14,16 +14,6 @@ // This is required because no Android.bp can include a library defined in an // Android.mk. Eventually should kill libfastboot (defined in Android.mk) -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "system_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-BSD - default_applicable_licenses: ["system_core_license"], -} - cc_library_host_static { name: "libfastboot2", diff --git a/fastboot/fuzzy_fastboot/Android.bp b/fastboot/fuzzy_fastboot/Android.bp index 56e35d2be..aa449b2fb 100644 --- a/fastboot/fuzzy_fastboot/Android.bp +++ b/fastboot/fuzzy_fastboot/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-BSD - default_applicable_licenses: ["system_core_license"], -} - cc_test_host { name: "fuzzy_fastboot", compile_multilib: "first", diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp index 3a49d4d4b..96cc5c8ed 100644 --- a/fs_mgr/Android.bp +++ b/fs_mgr/Android.bp @@ -14,16 +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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-MIT - default_applicable_licenses: ["system_core_license"], -} - cc_defaults { name: "fs_mgr_defaults", sanitize: { diff --git a/fs_mgr/libdm/Android.bp b/fs_mgr/libdm/Android.bp index 473a83b08..0efe384af 100644 --- a/fs_mgr/libdm/Android.bp +++ b/fs_mgr/libdm/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_static { name: "libdm", defaults: ["fs_mgr_defaults"], diff --git a/fs_mgr/libfiemap/Android.bp b/fs_mgr/libfiemap/Android.bp index fc00571bd..a62211082 100644 --- a/fs_mgr/libfiemap/Android.bp +++ b/fs_mgr/libfiemap/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_headers { name: "libfiemap_headers", recovery_available: true, diff --git a/fs_mgr/libfs_avb/Android.bp b/fs_mgr/libfs_avb/Android.bp index ec9ce4438..45e7a30a0 100644 --- a/fs_mgr/libfs_avb/Android.bp +++ b/fs_mgr/libfs_avb/Android.bp @@ -14,16 +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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-MIT - default_applicable_licenses: ["system_core_license"], -} - cc_library_static { name: "libfs_avb", defaults: ["fs_mgr_defaults"], diff --git a/fs_mgr/liblp/Android.bp b/fs_mgr/liblp/Android.bp index cc67c1754..9517bd3d4 100644 --- a/fs_mgr/liblp/Android.bp +++ b/fs_mgr/liblp/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - liblp_lib_deps = [ "libbase", "liblog", diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp index 744cd3505..678adf8a7 100644 --- a/fs_mgr/libsnapshot/Android.bp +++ b/fs_mgr/libsnapshot/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_defaults { name: "libsnapshot_defaults", defaults: ["fs_mgr_defaults"], diff --git a/fs_mgr/libstorage_literals/Android.bp b/fs_mgr/libstorage_literals/Android.bp index ab89f022e..beb18ef83 100644 --- a/fs_mgr/libstorage_literals/Android.bp +++ b/fs_mgr/libstorage_literals/Android.bp @@ -1,13 +1,4 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "system_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_headers { name: "libstorage_literals_headers", host_supported: true, diff --git a/fs_mgr/libvbmeta/Android.bp b/fs_mgr/libvbmeta/Android.bp index 6266cca94..a299b6e63 100644 --- a/fs_mgr/libvbmeta/Android.bp +++ b/fs_mgr/libvbmeta/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - libvbmeta_lib_deps = [ "libbase", "libcrypto", diff --git a/fs_mgr/tests/Android.bp b/fs_mgr/tests/Android.bp index b352339b5..9ed283a1e 100644 --- a/fs_mgr/tests/Android.bp +++ b/fs_mgr/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_test { name: "CtsFsMgrTestCases", test_suites: [ diff --git a/fs_mgr/tools/Android.bp b/fs_mgr/tools/Android.bp index 3b49b4afd..d6ccc4bae 100644 --- a/fs_mgr/tools/Android.bp +++ b/fs_mgr/tools/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "dmctl", srcs: ["dmctl.cpp"], diff --git a/gatekeeperd/Android.bp b/gatekeeperd/Android.bp index 9b90ebfef..d1046dfdf 100644 --- a/gatekeeperd/Android.bp +++ b/gatekeeperd/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "gatekeeperd", cflags: [ diff --git a/healthd/Android.bp b/healthd/Android.bp index 596b3d683..251a45bf0 100644 --- a/healthd/Android.bp +++ b/healthd/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_headers { name: "libhealthd_headers", vendor_available: true, diff --git a/healthd/testdata/Android.bp b/healthd/testdata/Android.bp index cf20eb9b8..110c79a87 100644 --- a/healthd/testdata/Android.bp +++ b/healthd/testdata/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - filegroup { name: "libhealthd_charger_test_data", srcs: ["**/*.*"], diff --git a/init/Android.bp b/init/Android.bp index bff5a5d50..b0a59b1b8 100644 --- a/init/Android.bp +++ b/init/Android.bp @@ -14,23 +14,6 @@ // limitations under the License. // -package { - default_applicable_licenses: ["system_core_init_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_core_init_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - init_common_sources = [ "action.cpp", "action_manager.cpp", diff --git a/init/Android.mk b/init/Android.mk index 65ee385de..561d641c6 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -64,9 +64,6 @@ LOCAL_SRC_FILES := \ util.cpp \ LOCAL_MODULE := init_first_stage -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_MODULE_STEM := init LOCAL_FORCE_STATIC_EXECUTABLE := true @@ -140,9 +137,6 @@ endif include $(CLEAR_VARS) LOCAL_MODULE := init_system -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_REQUIRED_MODULES := \ init_second_stage \ @@ -151,9 +145,6 @@ include $(BUILD_PHONY_PACKAGE) include $(CLEAR_VARS) LOCAL_MODULE := init_vendor -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) LOCAL_REQUIRED_MODULES := \ init_first_stage \ diff --git a/init/sysprop/Android.bp b/init/sysprop/Android.bp index 296cdc16d..7582875c5 100644 --- a/init/sysprop/Android.bp +++ b/init/sysprop/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_core_init_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_init_license"], -} - sysprop_library { name: "com.android.sysprop.init", srcs: ["InitProperties.sysprop"], diff --git a/init/test_kill_services/Android.bp b/init/test_kill_services/Android.bp index 37361a813..d59e548a4 100644 --- a/init/test_kill_services/Android.bp +++ b/init/test_kill_services/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_core_init_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_init_license"], -} - cc_test { name: "init_kill_services_test", srcs: ["init_kill_services_test.cpp"], diff --git a/init/test_service/Android.bp b/init/test_service/Android.bp index 37bc37116..8bd16a74f 100644 --- a/init/test_service/Android.bp +++ b/init/test_service/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_core_init_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_init_license"], -} - cc_binary { name: "test_service", srcs: ["test_service.cpp"], diff --git a/libappfuse/Android.bp b/libappfuse/Android.bp index aff2a0690..ae1481f72 100644 --- a/libappfuse/Android.bp +++ b/libappfuse/Android.bp @@ -1,14 +1,5 @@ // Copyright 2016 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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_defaults { name: "libappfuse_defaults", local_include_dirs: ["include"], diff --git a/libasyncio/Android.bp b/libasyncio/Android.bp index c26bcffa5..44e7933c3 100644 --- a/libasyncio/Android.bp +++ b/libasyncio/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_defaults { name: "libasyncio_defaults", cflags: [ diff --git a/libbinderwrapper/Android.bp b/libbinderwrapper/Android.bp index 23d18ca4a..d2487e20e 100644 --- a/libbinderwrapper/Android.bp +++ b/libbinderwrapper/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_defaults { name: "libbinderwrapper_defaults", diff --git a/libcrypto_utils/Android.bp b/libcrypto_utils/Android.bp index 146fc9354..923b29154 100644 --- a/libcrypto_utils/Android.bp +++ b/libcrypto_utils/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library { name: "libcrypto_utils", vendor_available: true, diff --git a/libcrypto_utils/tests/Android.bp b/libcrypto_utils/tests/Android.bp index a4f4e25f9..5aadfe203 100644 --- a/libcrypto_utils/tests/Android.bp +++ b/libcrypto_utils/tests/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_test_host { name: "libcrypto_utils_test", srcs: ["android_pubkey_test.cpp"], diff --git a/libcutils/Android.bp b/libcutils/Android.bp index 1bf84b4c6..c75e538d9 100644 --- a/libcutils/Android.bp +++ b/libcutils/Android.bp @@ -14,37 +14,6 @@ // limitations under the License. // -package { - default_applicable_licenses: ["system_core_libcutils_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_core_libcutils_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-BSD", - "SPDX-license-identifier-MIT", - ], - license_text: [ - "NOTICE", - ], -} - filegroup { name: "android_filesystem_config_header", srcs: ["include/private/android_filesystem_config.h"], diff --git a/libdiskconfig/Android.bp b/libdiskconfig/Android.bp index 29b4f7c4d..b92f0863d 100644 --- a/libdiskconfig/Android.bp +++ b/libdiskconfig/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library { name: "libdiskconfig", vendor_available: true, diff --git a/libgrallocusage/Android.bp b/libgrallocusage/Android.bp index f31b5f1a0..33ae13db6 100644 --- a/libgrallocusage/Android.bp +++ b/libgrallocusage/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_core_libgrallocusage_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_core_libgrallocusage_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_library { name: "libgrallocusage", vendor_available: true, diff --git a/libkeyutils/Android.bp b/libkeyutils/Android.bp index 26a589598..b388e9555 100644 --- a/libkeyutils/Android.bp +++ b/libkeyutils/Android.bp @@ -1,13 +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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-BSD - default_applicable_licenses: ["system_core_license"], -} - cc_library { name: "libkeyutils", cflags: ["-Werror"], diff --git a/libkeyutils/mini_keyctl/Android.bp b/libkeyutils/mini_keyctl/Android.bp index e103c479a..a04a3db24 100644 --- a/libkeyutils/mini_keyctl/Android.bp +++ b/libkeyutils/mini_keyctl/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_static { name: "libmini_keyctl_static", srcs: [ diff --git a/libmodprobe/Android.bp b/libmodprobe/Android.bp index a40787718..78da46cf1 100644 --- a/libmodprobe/Android.bp +++ b/libmodprobe/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_static { name: "libmodprobe", cflags: [ diff --git a/libnetutils/Android.bp b/libnetutils/Android.bp index 2864ad050..eec24151f 100644 --- a/libnetutils/Android.bp +++ b/libnetutils/Android.bp @@ -1,20 +1,3 @@ -package { - default_applicable_licenses: ["system_core_libnetutils_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_core_libnetutils_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_library_shared { name: "libnetutils", vendor_available: true, diff --git a/libpackagelistparser/Android.bp b/libpackagelistparser/Android.bp index 2c0ad47c4..c3f869255 100644 --- a/libpackagelistparser/Android.bp +++ b/libpackagelistparser/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library { name: "libpackagelistparser", ramdisk_available: true, diff --git a/libprocessgroup/Android.bp b/libprocessgroup/Android.bp index 948a870e9..f1041000e 100644 --- a/libprocessgroup/Android.bp +++ b/libprocessgroup/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_headers { name: "libprocessgroup_headers", vendor_available: true, diff --git a/libprocessgroup/cgrouprc/Android.bp b/libprocessgroup/cgrouprc/Android.bp index 968c5738e..def069b92 100644 --- a/libprocessgroup/cgrouprc/Android.bp +++ b/libprocessgroup/cgrouprc/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library { name: "libcgrouprc", host_supported: true, diff --git a/libprocessgroup/cgrouprc_format/Android.bp b/libprocessgroup/cgrouprc_format/Android.bp index 8be81bdd4..6428930a2 100644 --- a/libprocessgroup/cgrouprc_format/Android.bp +++ b/libprocessgroup/cgrouprc_format/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_static { name: "libcgrouprc_format", host_supported: true, diff --git a/libprocessgroup/profiles/Android.bp b/libprocessgroup/profiles/Android.bp index c46103acb..2d7bb5ac3 100644 --- a/libprocessgroup/profiles/Android.bp +++ b/libprocessgroup/profiles/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - prebuilt_etc { name: "cgroups.json", src: "cgroups.json", diff --git a/libprocessgroup/setup/Android.bp b/libprocessgroup/setup/Android.bp index 5ac213082..f6fc066f2 100644 --- a/libprocessgroup/setup/Android.bp +++ b/libprocessgroup/setup/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_shared { name: "libprocessgroup_setup", recovery_available: true, diff --git a/libqtaguid/Android.bp b/libqtaguid/Android.bp index 577b22736..de632caa2 100644 --- a/libqtaguid/Android.bp +++ b/libqtaguid/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_headers { name: "libqtaguid_headers", vendor_available: false, diff --git a/libsparse/Android.bp b/libsparse/Android.bp index cfe5eb54c..5b6ce4198 100644 --- a/libsparse/Android.bp +++ b/libsparse/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library { name: "libsparse", host_supported: true, diff --git a/libstats/push_compat/Android.bp b/libstats/push_compat/Android.bp index 62f2e8962..43ae69d2e 100644 --- a/libstats/push_compat/Android.bp +++ b/libstats/push_compat/Android.bp @@ -19,15 +19,6 @@ // protocols. This library should only be used by DNS resolver or other // native modules on Q that log pushed atoms to statsd. // ========================================================================= -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "system_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_defaults { name: "libstatspush_compat_defaults", srcs: [ @@ -74,3 +65,4 @@ cc_test { ], static_libs: ["libgmock"], } + diff --git a/libsuspend/Android.bp b/libsuspend/Android.bp index 4c6e1e55d..c5f1f5e0a 100644 --- a/libsuspend/Android.bp +++ b/libsuspend/Android.bp @@ -1,14 +1,5 @@ // Copyright 2012 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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library { name: "libsuspend", srcs: [ diff --git a/libsync/Android.bp b/libsync/Android.bp index 540a246e2..4828892b8 100644 --- a/libsync/Android.bp +++ b/libsync/Android.bp @@ -1,20 +1,3 @@ -package { - default_applicable_licenses: ["system_core_libsync_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_core_libsync_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - ndk_headers { name: "libsync_headers", from: "include/ndk", diff --git a/libsystem/Android.bp b/libsystem/Android.bp index 062f3eb57..b37b8eccd 100644 --- a/libsystem/Android.bp +++ b/libsystem/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_headers { name: "libsystem_headers", vendor_available: true, diff --git a/libsysutils/Android.bp b/libsysutils/Android.bp index 94f556c99..3b98babb6 100644 --- a/libsysutils/Android.bp +++ b/libsysutils/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library { name: "libsysutils", vendor_available: true, diff --git a/libusbhost/Android.bp b/libusbhost/Android.bp index 6e71f4360..fc6f305c0 100644 --- a/libusbhost/Android.bp +++ b/libusbhost/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library { name: "libusbhost", vendor_available: true, diff --git a/libutils/Android.bp b/libutils/Android.bp index c9ecfa9be..1e7cbdb77 100644 --- a/libutils/Android.bp +++ b/libutils/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_core_libutils_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_core_libutils_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_library_headers { name: "libutils_headers", vendor_available: true, diff --git a/libvndksupport/Android.bp b/libvndksupport/Android.bp index ade8d636a..a5cece408 100644 --- a/libvndksupport/Android.bp +++ b/libvndksupport/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library { name: "libvndksupport", native_bridge_supported: true, diff --git a/libvndksupport/tests/Android.bp b/libvndksupport/tests/Android.bp index dc0fa65bd..2570cce95 100644 --- a/libvndksupport/tests/Android.bp +++ b/libvndksupport/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_test { name: "libvndksupport-tests", srcs: [ diff --git a/llkd/Android.bp b/llkd/Android.bp index d6a558a6a..62a637dcd 100644 --- a/llkd/Android.bp +++ b/llkd/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_headers { name: "llkd_headers", diff --git a/llkd/tests/Android.bp b/llkd/tests/Android.bp index 17d140269..6dd5938e3 100644 --- a/llkd/tests/Android.bp +++ b/llkd/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_test { name: "llkd_unit_test", diff --git a/property_service/libpropertyinfoparser/Android.bp b/property_service/libpropertyinfoparser/Android.bp index 14b38460f..877789632 100644 --- a/property_service/libpropertyinfoparser/Android.bp +++ b/property_service/libpropertyinfoparser/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_static { name: "libpropertyinfoparser", host_supported: true, diff --git a/property_service/libpropertyinfoserializer/Android.bp b/property_service/libpropertyinfoserializer/Android.bp index d34a00606..f91bc3785 100644 --- a/property_service/libpropertyinfoserializer/Android.bp +++ b/property_service/libpropertyinfoserializer/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_defaults { name: "propertyinfoserializer_defaults", host_supported: true, diff --git a/property_service/property_info_checker/Android.bp b/property_service/property_info_checker/Android.bp index e0aa6603a..66f378a80 100644 --- a/property_service/property_info_checker/Android.bp +++ b/property_service/property_info_checker/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "property_info_checker", host_supported: true, diff --git a/qemu_pipe/Android.bp b/qemu_pipe/Android.bp index f771c68a4..ad86a4e6d 100644 --- a/qemu_pipe/Android.bp +++ b/qemu_pipe/Android.bp @@ -1,14 +1,5 @@ // Copyright 2011 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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_static { name: "libqemu_pipe", vendor_available: true, diff --git a/reboot/Android.bp b/reboot/Android.bp index 7fbd2a3da..cc717234e 100644 --- a/reboot/Android.bp +++ b/reboot/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "reboot", srcs: ["reboot.c"], diff --git a/rootdir/Android.bp b/rootdir/Android.bp index aceb7dcde..d63868aa4 100644 --- a/rootdir/Android.bp +++ b/rootdir/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - prebuilt_etc { name: "init.rc", src: "init.rc", diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 6cbd867ce..73d11011d 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -5,9 +5,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := init-debug.rc -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 := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/init @@ -21,9 +18,6 @@ ifneq ($(filter address,$(SANITIZE_TARGET)),) include $(CLEAR_VARS) LOCAL_MODULE := asan.options -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_PATH := $(TARGET_OUT) @@ -35,9 +29,6 @@ ASAN_EXTRACT_FILES := ifeq ($(SANITIZE_TARGET_SYSTEM),true) include $(CLEAR_VARS) LOCAL_MODULE:= asan_extract -LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS:= notice -LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/../NOTICE LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_SRC_FILES := asan_extract.sh @@ -56,9 +47,6 @@ endif include $(CLEAR_VARS) LOCAL_MODULE_CLASS := ETC LOCAL_MODULE := init.environ.rc -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) EXPORT_GLOBAL_ASAN_OPTIONS := @@ -194,9 +182,6 @@ endef # sanitizer.libraries.txt include $(CLEAR_VARS) LOCAL_MODULE := sanitizer.libraries.txt -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_MODULE_STEM := $(LOCAL_MODULE) @@ -221,9 +206,6 @@ $(LOCAL_BUILT_MODULE): # adb_debug.prop in debug ramdisk include $(CLEAR_VARS) LOCAL_MODULE := adb_debug.prop -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 := ETC LOCAL_MODULE_PATH := $(TARGET_DEBUG_RAMDISK_OUT) diff --git a/rootdir/avb/Android.bp b/rootdir/avb/Android.bp index a4aca9b48..8c7caf311 100644 --- a/rootdir/avb/Android.bp +++ b/rootdir/avb/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - filegroup { name: "q-gsi_avbpubkey", srcs: [ diff --git a/rootdir/avb/Android.mk b/rootdir/avb/Android.mk index 50aa6f66d..f71f205cc 100644 --- a/rootdir/avb/Android.mk +++ b/rootdir/avb/Android.mk @@ -19,9 +19,6 @@ endif include $(CLEAR_VARS) LOCAL_MODULE := q-gsi.avbpubkey -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) @@ -33,9 +30,6 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := q-developer-gsi.avbpubkey -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) @@ -47,9 +41,6 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := r-gsi.avbpubkey -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) @@ -61,9 +52,6 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := r-developer-gsi.avbpubkey -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) @@ -75,9 +63,6 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := s-gsi.avbpubkey -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) @@ -89,9 +74,6 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := s-developer-gsi.avbpubkey -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) @@ -103,9 +85,6 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := qcar-gsi.avbpubkey -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) diff --git a/run-as/Android.bp b/run-as/Android.bp index 9baee8f11..accd07d01 100644 --- a/run-as/Android.bp +++ b/run-as/Android.bp @@ -14,23 +14,6 @@ // limitations under the License. // -package { - default_applicable_licenses: ["system_core_run-as_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_core_run-as_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_binary { name: "run-as", srcs: [ diff --git a/sdcard/Android.bp b/sdcard/Android.bp index b9cb95bb0..c096587ba 100644 --- a/sdcard/Android.bp +++ b/sdcard/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { srcs: ["sdcard.cpp"], name: "sdcard", diff --git a/set-verity-state/Android.bp b/set-verity-state/Android.bp index 4940eca22..da112c906 100644 --- a/set-verity-state/Android.bp +++ b/set-verity-state/Android.bp @@ -1,14 +1,5 @@ // Copyright 2019 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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "set-verity-state", srcs: ["set-verity-state.cpp"], diff --git a/shell_and_utilities/Android.bp b/shell_and_utilities/Android.bp index 0c642f4af..5e013fe82 100644 --- a/shell_and_utilities/Android.bp +++ b/shell_and_utilities/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - phony { name: "shell_and_utilities", required: [ diff --git a/storaged/Android.bp b/storaged/Android.bp index f84fd10c2..cc19481bc 100644 --- a/storaged/Android.bp +++ b/storaged/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_defaults { name: "storaged_defaults", diff --git a/toolbox/Android.bp b/toolbox/Android.bp index 8594ec403..320782419 100644 --- a/toolbox/Android.bp +++ b/toolbox/Android.bp @@ -1,20 +1,3 @@ -package { - default_applicable_licenses: ["system_core_toolbox_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "system_core_toolbox_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - cc_defaults { name: "toolbox_defaults", cflags: [ diff --git a/trusty/apploader/Android.bp b/trusty/apploader/Android.bp index c6710648a..7e97cb8f7 100644 --- a/trusty/apploader/Android.bp +++ b/trusty/apploader/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "trusty_apploader", vendor: true, diff --git a/trusty/confirmationui/Android.bp b/trusty/confirmationui/Android.bp index 2674cd970..60e0e71b2 100644 --- a/trusty/confirmationui/Android.bp +++ b/trusty/confirmationui/Android.bp @@ -19,15 +19,6 @@ // to only building on ARM if they include assembly. Individual makefiles // are responsible for having their own logic, for fine-grained control. -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "system_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "android.hardware.confirmationui@1.0-service.trusty", relative_install_path: "hw", @@ -101,4 +92,4 @@ cc_library { "-Werror", "-DTEEUI_USE_STD_VECTOR", ], -} +}
\ No newline at end of file diff --git a/trusty/confirmationui/fuzz/Android.bp b/trusty/confirmationui/fuzz/Android.bp index 5260b60b2..635966fef 100644 --- a/trusty/confirmationui/fuzz/Android.bp +++ b/trusty/confirmationui/fuzz/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_fuzz { name: "trusty_confirmationui_fuzzer", defaults: ["trusty_fuzzer_defaults"], diff --git a/trusty/coverage/Android.bp b/trusty/coverage/Android.bp index 0e468be70..daa6f033b 100644 --- a/trusty/coverage/Android.bp +++ b/trusty/coverage/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library { name: "libtrusty_coverage", vendor_available: true, diff --git a/trusty/fuzz/Android.bp b/trusty/fuzz/Android.bp index 86ad74fb7..ad138166b 100644 --- a/trusty/fuzz/Android.bp +++ b/trusty/fuzz/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_defaults { name: "trusty_fuzzer_defaults", shared_libs: [ diff --git a/trusty/fuzz/test/Android.bp b/trusty/fuzz/test/Android.bp index f3f35995f..66e103d86 100644 --- a/trusty/fuzz/test/Android.bp +++ b/trusty/fuzz/test/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_fuzz { name: "trusty_test_fuzzer", defaults: ["trusty_fuzzer_defaults"], diff --git a/trusty/gatekeeper/Android.bp b/trusty/gatekeeper/Android.bp index 839031330..e553af1b5 100644 --- a/trusty/gatekeeper/Android.bp +++ b/trusty/gatekeeper/Android.bp @@ -19,15 +19,6 @@ // to only building on ARM if they include assembly. Individual makefiles // are responsible for having their own logic, for fine-grained control. -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "system_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "android.hardware.gatekeeper@1.0-service.trusty", defaults: ["hidl_defaults"], diff --git a/trusty/gatekeeper/fuzz/Android.bp b/trusty/gatekeeper/fuzz/Android.bp index 8ee0e1104..7ffa77674 100644 --- a/trusty/gatekeeper/fuzz/Android.bp +++ b/trusty/gatekeeper/fuzz/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_fuzz { name: "trusty_gatekeeper_fuzzer", defaults: ["trusty_fuzzer_defaults"], diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp index fbdfbe2ad..27e1a3f5b 100644 --- a/trusty/keymaster/Android.bp +++ b/trusty/keymaster/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "android.hardware.keymaster@3.0-service.trusty", defaults: ["hidl_defaults"], @@ -116,3 +107,4 @@ cc_binary { "-Werror", ], } + diff --git a/trusty/keymaster/fuzz/Android.bp b/trusty/keymaster/fuzz/Android.bp index f695fbc90..da9f9ec65 100644 --- a/trusty/keymaster/fuzz/Android.bp +++ b/trusty/keymaster/fuzz/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_fuzz { name: "trusty_keymaster_fuzzer", defaults: ["trusty_fuzzer_defaults"], diff --git a/trusty/libtrusty/Android.bp b/trusty/libtrusty/Android.bp index 4b6320948..e0161a56b 100644 --- a/trusty/libtrusty/Android.bp +++ b/trusty/libtrusty/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_defaults { name: "libtrusty_defaults", srcs: ["trusty.c"], diff --git a/trusty/libtrusty/tipc-test/Android.bp b/trusty/libtrusty/tipc-test/Android.bp index 4ac4ebf10..5e60d2811 100644 --- a/trusty/libtrusty/tipc-test/Android.bp +++ b/trusty/libtrusty/tipc-test/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_test { name: "tipc-test", vendor: true, diff --git a/trusty/secure_dpu/Android.bp b/trusty/secure_dpu/Android.bp index b24c3309a..0d57cea94 100644 --- a/trusty/secure_dpu/Android.bp +++ b/trusty/secure_dpu/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_headers { name: "secure_dpu_headers", vendor: true, diff --git a/trusty/storage/interface/Android.bp b/trusty/storage/interface/Android.bp index e2b0d2648..18b4a5f90 100644 --- a/trusty/storage/interface/Android.bp +++ b/trusty/storage/interface/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_static { name: "libtrustystorageinterface", vendor: true, diff --git a/trusty/storage/lib/Android.bp b/trusty/storage/lib/Android.bp index 664255272..2fba17edd 100644 --- a/trusty/storage/lib/Android.bp +++ b/trusty/storage/lib/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_library_static { name: "libtrustystorage", vendor: true, diff --git a/trusty/storage/proxy/Android.bp b/trusty/storage/proxy/Android.bp index 36441dd5b..b93facbbc 100644 --- a/trusty/storage/proxy/Android.bp +++ b/trusty/storage/proxy/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "storageproxyd", vendor: true, diff --git a/trusty/storage/tests/Android.bp b/trusty/storage/tests/Android.bp index 64616c7a3..536c3ca7a 100644 --- a/trusty/storage/tests/Android.bp +++ b/trusty/storage/tests/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_test { name: "secure-storage-unit-test", vendor: true, diff --git a/trusty/utils/rpmb_dev/Android.bp b/trusty/utils/rpmb_dev/Android.bp index b944c6bb6..e923e829c 100644 --- a/trusty/utils/rpmb_dev/Android.bp +++ b/trusty/utils/rpmb_dev/Android.bp @@ -11,16 +11,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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-MIT - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "rpmb_dev", vendor: true, diff --git a/trusty/utils/spiproxyd/Android.bp b/trusty/utils/spiproxyd/Android.bp index 72c548d36..c1d0987a3 100644 --- a/trusty/utils/spiproxyd/Android.bp +++ b/trusty/utils/spiproxyd/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "spiproxyd", vendor: true, diff --git a/trusty/utils/trusty-ut-ctrl/Android.bp b/trusty/utils/trusty-ut-ctrl/Android.bp index 960a82e34..664696a0d 100644 --- a/trusty/utils/trusty-ut-ctrl/Android.bp +++ b/trusty/utils/trusty-ut-ctrl/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "trusty-ut-ctrl", vendor: true, diff --git a/usbd/Android.bp b/usbd/Android.bp index fdb982a78..6a339a109 100644 --- a/usbd/Android.bp +++ b/usbd/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "usbd", init_rc: ["usbd.rc"], diff --git a/watchdogd/Android.bp b/watchdogd/Android.bp index 9b3ede97f..0fbc33cd2 100644 --- a/watchdogd/Android.bp +++ b/watchdogd/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_core_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["system_core_license"], -} - cc_binary { name: "watchdogd", recovery_available: true, |