Snap for 7468467 from 7f710d0066c776c967baf2ab3c8a0ad00719a96a to mainline-mediaprovider-releaseandroid-mainline-12.0.0_r90android-mainline-12.0.0_r76android-mainline-12.0.0_r48android-mainline-12.0.0_r31android-mainline-12.0.0_r121android-mainline-12.0.0_r11android-mainline-12.0.0_r106aml_mpr_311911090android12-mainline-mediaprovider-release

Change-Id: I8c30cb95deafc77a17308125c6c5fceac57bbb4c

2 files changed, 64 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index a14ce10..b3bc32c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,38 @@
+package {
+    default_applicable_licenses: ["external_libsrtp2_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_libsrtp2_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 cc_library_static {
     host_supported: true,
+    // vendor needed for libpreprocessing effects.
+    vendor: true,
     name: "libsrtp2",
     srcs: [
         "crypto/cipher/aes.c",
@@ -32,6 +65,34 @@ cc_library_static {
         "-DHAVE_CONFIG_H",
     ],
     export_include_dirs: [
+        "crypto/include",
+        "include",
         "exported_include",
     ],
+    visibility: [
+        "//external/webrtc:__subpackages__",
+        "//device/google/cuttlefish/host/frontend/webrtc:__subpackages__",
+    ],
+}
+
+cc_fuzz {
+    name: "libsrtp2-fuzzer",
+    host_supported: true,
+    vendor: true,
+    static_libs: ["libsrtp2"],
+    cflags: [
+        "-Wno-unused-parameter",
+    ],
+    srcs: [
+        "fuzzer/fuzzer.c",
+        "fuzzer/mt19937.cpp",
+        "fuzzer/testmem.c",
+    ],
+    // There are so many corpus files that when all are used it
+    // exceeds the posix_spawn limit. So, only some of the files
+    // are used.
+    corpus: ["fuzzer/corpus/0*"],
+    fuzz_config: {
+        componentid: 87896
+    }
 }
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}