diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-03-04 01:10:16 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-04 01:10:16 +0000 |
commit | 9342e1f48be1c3c8f7339793932e6770a91e79a1 (patch) | |
tree | e7436828b4d66f275c3baf15fe713fa1048fb888 | |
parent | be878ffc4524381287363ec25f53f2471d2c6734 (diff) | |
parent | 0c76dfdbb270102352504c6763a50fd1277fc2b3 (diff) | |
download | libbcc-9342e1f48be1c3c8f7339793932e6770a91e79a1.tar.gz |
Merge "Snap for 7183507 from 4bf3f984d92c9ae324c92742b728d276f74ee2e8 to sdk-release" into sdk-releaseplatform-tools-31.0.3platform-tools-31.0.2platform-tools-31.0.1
-rw-r--r-- | Android.bp | 33 | ||||
-rw-r--r-- | bcinfo/Android.bp | 10 | ||||
-rw-r--r-- | bcinfo/BitReader_2_7/Android.bp | 9 | ||||
-rw-r--r-- | bcinfo/BitReader_3_0/Android.bp | 9 | ||||
-rw-r--r-- | bcinfo/Wrap/Android.bp | 10 | ||||
-rw-r--r-- | bcinfo/tools/Android.bp | 9 | ||||
-rw-r--r-- | lib/Android.bp | 9 | ||||
-rw-r--r-- | tools/Android.bp | 9 | ||||
-rw-r--r-- | tools/bcc/Android.bp | 9 | ||||
-rw-r--r-- | tools/bcc_compat/Android.bp | 9 | ||||
-rw-r--r-- | tools/bcc_strip_attr/Android.bp | 9 |
11 files changed, 125 insertions, 0 deletions
@@ -14,6 +14,39 @@ // limitations under the License. // +package { + default_applicable_licenses: ["frameworks_compile_libbcc_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: "frameworks_compile_libbcc_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-MIT", + "SPDX-license-identifier-NCSA", + "legacy_unencumbered", + ], + license_text: [ + "NOTICE", + ], +} + cc_defaults { name: "libbcc-defaults", defaults: [ diff --git a/bcinfo/Android.bp b/bcinfo/Android.bp index c05286e..95f7f0d 100644 --- a/bcinfo/Android.bp +++ b/bcinfo/Android.bp @@ -14,6 +14,16 @@ // 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 "frameworks_compile_libbcc_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_libbcc_license"], +} + cc_library_shared { name: "libbcinfo", vendor_available: true, diff --git a/bcinfo/BitReader_2_7/Android.bp b/bcinfo/BitReader_2_7/Android.bp index 3003ff0..22636fb 100644 --- a/bcinfo/BitReader_2_7/Android.bp +++ b/bcinfo/BitReader_2_7/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_libbcc_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_libbcc_license"], +} + cc_library_static { name: "libLLVMBitReader_2_7", vendor_available: true, diff --git a/bcinfo/BitReader_3_0/Android.bp b/bcinfo/BitReader_3_0/Android.bp index 858d2d0..f3e58e7 100644 --- a/bcinfo/BitReader_3_0/Android.bp +++ b/bcinfo/BitReader_3_0/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_libbcc_license" + // to get the below license kinds: + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_libbcc_license"], +} + cc_library_static { name: "libLLVMBitReader_3_0", vendor_available: true, diff --git a/bcinfo/Wrap/Android.bp b/bcinfo/Wrap/Android.bp index 575bdbb..f86684a 100644 --- a/bcinfo/Wrap/Android.bp +++ b/bcinfo/Wrap/Android.bp @@ -14,6 +14,16 @@ // 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 "frameworks_compile_libbcc_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-NCSA + default_applicable_licenses: ["frameworks_compile_libbcc_license"], +} + cc_library_static { name: "libLLVMWrap", vendor_available: true, diff --git a/bcinfo/tools/Android.bp b/bcinfo/tools/Android.bp index 99dfb03..17d9c03 100644 --- a/bcinfo/tools/Android.bp +++ b/bcinfo/tools/Android.bp @@ -16,6 +16,15 @@ // Executable for host // ======================================================== +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_libbcc_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_compile_libbcc_license"], +} + cc_binary_host { name: "bcinfo", defaults: ["llvm-defaults"], diff --git a/lib/Android.bp b/lib/Android.bp index addae03..583afa0 100644 --- a/lib/Android.bp +++ b/lib/Android.bp @@ -12,6 +12,15 @@ // 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 "frameworks_compile_libbcc_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_compile_libbcc_license"], +} + cc_library { name: "libbcc", vendor_available: true, diff --git a/tools/Android.bp b/tools/Android.bp index 15e0a1e..4761453 100644 --- a/tools/Android.bp +++ b/tools/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_libbcc_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_compile_libbcc_license"], +} + subdirs = [ "bcc", "bcc_compat", diff --git a/tools/bcc/Android.bp b/tools/bcc/Android.bp index 5a64c4d..d2d36ad 100644 --- a/tools/bcc/Android.bp +++ b/tools/bcc/Android.bp @@ -14,6 +14,15 @@ // 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 "frameworks_compile_libbcc_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_compile_libbcc_license"], +} + cc_binary { name: "bcc", host_supported: true, diff --git a/tools/bcc_compat/Android.bp b/tools/bcc_compat/Android.bp index 2cc54c7..192d576 100644 --- a/tools/bcc_compat/Android.bp +++ b/tools/bcc_compat/Android.bp @@ -16,6 +16,15 @@ // Executable for host // ======================================================== +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_libbcc_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_compile_libbcc_license"], +} + cc_binary_host { name: "bcc_compat", defaults: ["libbcc-defaults"], diff --git a/tools/bcc_strip_attr/Android.bp b/tools/bcc_strip_attr/Android.bp index b463b2f..7243770 100644 --- a/tools/bcc_strip_attr/Android.bp +++ b/tools/bcc_strip_attr/Android.bp @@ -16,6 +16,15 @@ // Executable for host // ======================================================== +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_compile_libbcc_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_compile_libbcc_license"], +} + cc_binary_host { name: "bcc_strip_attr", defaults: ["libbcc-defaults"], |