Commit 7c309c45 authored by Frank Barchard's avatar Frank Barchard

cherry picking changes needed for deps roll.

DEPS roll is needed for mips builds.  These additional changes are also
needed for that DEPS roll.  These can be done separately.

TBR=kjellander@chromium.org
BUG=libyuv:634
TEST=try bots

Review URL: https://codereview.chromium.org/2446043003 .
parent 2488b310
...@@ -26,6 +26,7 @@ pin-log.txt ...@@ -26,6 +26,7 @@ pin-log.txt
/third_party/ashmem /third_party/ashmem
/third_party/binutils /third_party/binutils
/third_party/bouncycastle /third_party/bouncycastle
/third_party/byte_buddy
/third_party/BUILD.gn /third_party/BUILD.gn
/third_party/catapult /third_party/catapult
/third_party/ced /third_party/ced
...@@ -50,6 +51,7 @@ pin-log.txt ...@@ -50,6 +51,7 @@ pin-log.txt
/third_party/lss /third_party/lss
/third_party/mockito /third_party/mockito
/third_party/modp_b64 /third_party/modp_b64
/third_party/objenesis
/third_party/ow2_asm /third_party/ow2_asm
/third_party/proguard /third_party/proguard
/third_party/protobuf /third_party/protobuf
......
...@@ -23,3 +23,8 @@ build_with_chromium = false ...@@ -23,3 +23,8 @@ build_with_chromium = false
# Some non-Chromium builds don't support building java targets. # Some non-Chromium builds don't support building java targets.
enable_java_templates = true enable_java_templates = true
# Allow using custom suppressions files (currently not used by libyuv).
asan_suppressions_file = "//build/sanitizers/asan_suppressions.cc"
lsan_suppressions_file = "//build/sanitizers/lsan_suppressions.cc"
tsan_suppressions_file = "//build/sanitizers/tsan_suppressions.cc"
...@@ -69,6 +69,7 @@ if 'android' in target_os: ...@@ -69,6 +69,7 @@ if 'android' in target_os:
'third_party/appurify-python', 'third_party/appurify-python',
'third_party/ashmem', 'third_party/ashmem',
'third_party/bouncycastle', 'third_party/bouncycastle',
'third_party/byte_buddy',
'third_party/catapult', 'third_party/catapult',
'third_party/ced', 'third_party/ced',
'third_party/closure_compiler', 'third_party/closure_compiler',
...@@ -83,6 +84,7 @@ if 'android' in target_os: ...@@ -83,6 +84,7 @@ if 'android' in target_os:
'third_party/libxml', 'third_party/libxml',
'third_party/mockito', 'third_party/mockito',
'third_party/modp_b64', 'third_party/modp_b64',
'third_party/objenesis',
'third_party/ow2_asm', 'third_party/ow2_asm',
'third_party/protobuf', 'third_party/protobuf',
'third_party/requests', 'third_party/requests',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment