Mark ab/7061308 as merged in stage.
Bug: 180401296
Merged-In: Iedeee8f6a36af55a709d307659aefe8e92177287
Change-Id: I7c0c27661eca36db126c0ae4f04916f9fa49cc51
diff --git a/Android.bp b/Android.bp
index a96ac07..1b7ba21 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,38 @@
+// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE
+// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+// DEPENDING ON IT IN YOUR PROJECT. ***
+package {
+ default_applicable_licenses: ["external_honggfuzz_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_honggfuzz_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-MIT",
+ "legacy_by_exception_only", // by exception only
+ ],
+ license_text: [
+ "COPYING",
+ ],
+}
+
subdirs = [
"third_party/android/libBlocksRuntime",
]
@@ -103,4 +137,3 @@
"linux/bfd.c",
],
}
-
diff --git a/METADATA b/METADATA
index 1de1e5a..c3864c6 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,6 @@
+# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE
+# CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+# DEPENDING ON IT IN YOUR PROJECT. ***
name: "Hongfuzz"
description: "A security oriented, feedback-driven, evolutionary, easy-to-use fuzzer with interesting analysis options."
third_party {
@@ -10,7 +13,8 @@
value: "https://github.com/google/honggfuzz"
}
version: "2.3"
- license_type: NOTICE
+ # would be NOTICE save for third_party/mac/
+ license_type: BY_EXCEPTION_ONLY
last_upgrade_date {
year: 2020
month: 11
diff --git a/third_party/android/libBlocksRuntime/Android.bp b/third_party/android/libBlocksRuntime/Android.bp
index edb26d0..2396553 100644
--- a/third_party/android/libBlocksRuntime/Android.bp
+++ b/third_party/android/libBlocksRuntime/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 "external_honggfuzz_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-MIT
+ default_applicable_licenses: ["external_honggfuzz_license"],
+}
+
cc_library {
name: "libBlocksRuntime",
cflags: [