commit 7c0c2eac902fafe33c6e9b611a239609bfa6efef
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Apr 28 15:58:02 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Apr 28 15:58:02 2022 +0000
tree 121ebb9b8ea23c8e1770d0f46064d58d0d268ad4
parent f522d3484026f409d47e34deedf0aa1633b1b9e0
parent d5dd8af06e1b4c3bcd96a4de4bf1b8f1fbf1cbd5

Snap for 8512216 from d5dd8af06e1b4c3bcd96a4de4bf1b8f1fbf1cbd5 to tm-frc-permission-release

Change-Id: Ia9012f78f0f401abab87893b0620a4e70816eb16

Android.bp

diff --git a/Android.bp b/Android.bp
index 0681e93..f7933b3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -133,7 +133,6 @@
     rtti: true,
     cppflags: ["-fexceptions"],
 
-    clang: true,
     sanitize: {
         misc_undefined: [
             "unsigned-integer-overflow",
@@ -142,7 +141,7 @@
     },
 }
 
-cc_library{
+cc_library {
     name: "libdng_sdk",
     host_supported: true,
     vendor_available: true,
@@ -156,7 +155,7 @@
     ],
 
     target: {
-        linux_glibc: {
+        host_linux: {
             static_libs: ["libcompiler_rt-extras"],
         },
         darwin: {

METADATA

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
 }

fuzzer/Android.bp

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 @@
         "seeds/CVE_2020_9589/original.dng",
         "seeds/CVE_2020_9589/poc.dng",
     ],
+    fuzz_config: {
+       cc: ["android-security-assurance-redteam@google.com"],
+    },
 }