summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-05-08 04:31:08 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-05-08 04:31:08 +0000
commit766513025f55230f6d2acc097c1a3eb9ae6fc23c (patch)
tree121ebb9b8ea23c8e1770d0f46064d58d0d268ad4
parent06615d889929f4aa3ce57b53c76fab2bf4853c78 (diff)
parent73bff36f7afeb6a349a44c83d7b13bf4faee4158 (diff)
downloaddng_sdk-766513025f55230f6d2acc097c1a3eb9ae6fc23c.tar.gz
Snap for 8554636 from 73bff36f7afeb6a349a44c83d7b13bf4faee4158 to sdk-releaseplatform-tools-33.0.2
Change-Id: I38f24e83b991a84e9de56024420c549a97b951fa
-rw-r--r--Android.bp5
-rw-r--r--METADATA1
-rw-r--r--fuzzer/Android.bp3
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"],
+ },
}