Snap for 8512216 from d5dd8af06e1b4c3bcd96a4de4bf1b8f1fbf1cbd5 to tm-frc-art-releaset_frc_art_330443060android13-frc-art-release

Change-Id: I129ab29d6fd8622409db6bb040f6401d66bffc41

3 files changed, 6 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index 0681e93..f7933b3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -133,7 +133,6 @@ cc_defaults {
     rtti: true,
     cppflags: ["-fexceptions"],
 
-    clang: true,
     sanitize: {
         misc_undefined: [
             "unsigned-integer-overflow",
@@ -142,7 +141,7 @@ cc_defaults {
     },
 }
 
-cc_library{
+cc_library {
     name: "libdng_sdk",
     host_supported: true,
     vendor_available: true,
@@ -156,7 +155,7 @@ cc_library{
     ],
 
     target: {
-        linux_glibc: {
+        host_linux: {
             static_libs: ["libcompiler_rt-extras"],
         },
         darwin: {
diff --git a/METADATA b/METADATA
index 3814b8d..92c927f 100644
--- a/METADATA
+++ b/METADATA
@@ -2,5 +2,6 @@
 #     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
 #     DEPENDING ON IT IN YOUR PROJECT. ***
 third_party {
+  license_note: "Adobe's DNG SDK License Agreement"
   license_type: BY_EXCEPTION_ONLY
 }
diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index 26e2fa6..e3dcecf 100644
--- a/fuzzer/Android.bp
+++ b/fuzzer/Android.bp
@@ -36,4 +36,7 @@ cc_fuzz {
         "seeds/CVE_2020_9589/original.dng",
         "seeds/CVE_2020_9589/poc.dng",
     ],
+    fuzz_config: {
+       cc: ["android-security-assurance-redteam@google.com"],
+    },
 }