aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-25 20:58:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-25 20:58:32 +0000
commite78935e46c290b415c856365f859ba6a762f96d4 (patch)
treef252e377ef0018c4d2e2438f7e18753686d28d04
parent360425b6c6ddf27274e1b38bc8e75afcb920d49a (diff)
parenta2e2063784064c7ebe98992dc6f3419739c7e698 (diff)
downloadprotobuf-e78935e46c290b415c856365f859ba6a762f96d4.tar.gz
Revert "[LSC] Add LOCAL_LICENSE_KINDS to external/protobuf" am: a2e2063784
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/13701125 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3e35a337132b6cb3731d13c21b91001e01f8117c
-rw-r--r--Android.bp33
1 files changed, 0 insertions, 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: [