From a2e2063784064c7ebe98992dc6f3419739c7e698 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Thu, 25 Feb 2021 11:53:32 -0800 Subject: Revert "[LSC] Add LOCAL_LICENSE_KINDS to external/protobuf" This reverts commit 2e6ce28d7b2a6cb07248f42f02c2a21f55fa6073. Change-Id: I0bdd54a8bf343354b0fac06d88720bb98246fc97 --- Android.bp | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/Android.bp b/Android.bp index 5505b2e6d..82369bf2a 100644 --- a/Android.bp +++ b/Android.bp @@ -14,39 +14,6 @@ // // -package { - default_applicable_licenses: ["external_protobuf_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: "external_protobuf_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-BSD", - "SPDX-license-identifier-GPL-2.0", - "SPDX-license-identifier-MIT", - "legacy_unencumbered", - ], - license_text: [ - "LICENSE", - ], -} - cc_defaults { name: "protobuf-cflags-defaults", clang_cflags: [ -- cgit v1.2.3