2019-10-01 13:30:07 +02:00
|
|
|
diff --git base/BUILD.gn base/BUILD.gn
|
2020-06-09 19:48:00 +02:00
|
|
|
index c3baf1ffdee3..6a4765994566 100644
|
2019-10-01 13:30:07 +02:00
|
|
|
--- base/BUILD.gn
|
|
|
|
|
+++ base/BUILD.gn
|
2020-06-09 19:48:00 +02:00
|
|
|
@@ -34,6 +34,7 @@ import("//build/config/sysroot.gni")
|
2019-10-01 13:30:07 +02:00
|
|
|
import("//build/config/ui.gni")
|
|
|
|
|
import("//build/nocompile.gni")
|
|
|
|
|
import("//build/timestamp.gni")
|
|
|
|
|
+import("//cef/libcef/features/features.gni")
|
|
|
|
|
import("//testing/libfuzzer/fuzzer_test.gni")
|
|
|
|
|
import("//testing/test.gni")
|
2019-11-12 17:11:44 +01:00
|
|
|
import("//third_party/icu/config.gni")
|
2020-06-09 19:48:00 +02:00
|
|
|
@@ -1665,7 +1666,11 @@ jumbo_component("base") {
|
2019-10-01 13:30:07 +02:00
|
|
|
"hash/md5_constexpr_internal.h",
|
|
|
|
|
"hash/sha1.h",
|
|
|
|
|
]
|
|
|
|
|
- if (is_nacl) {
|
|
|
|
|
+ deps += [ "//cef/libcef/features" ]
|
|
|
|
|
+ if (enable_cef) {
|
|
|
|
|
+ configs += [ "//cef/libcef/features:config" ]
|
|
|
|
|
+ }
|
|
|
|
|
+ if (is_nacl || is_cef_sandbox_build) {
|
|
|
|
|
sources += [
|
|
|
|
|
"hash/md5_nacl.cc",
|
|
|
|
|
"hash/md5_nacl.h",
|
|
|
|
|
diff --git base/hash/md5.h base/hash/md5.h
|
|
|
|
|
index 8a49f08dcb04..2f03d7a6d1b3 100644
|
|
|
|
|
--- base/hash/md5.h
|
|
|
|
|
+++ base/hash/md5.h
|
|
|
|
|
@@ -10,8 +10,9 @@
|
|
|
|
|
#include "base/base_export.h"
|
|
|
|
|
#include "base/strings/string_piece.h"
|
|
|
|
|
#include "build/build_config.h"
|
|
|
|
|
+#include "cef/libcef/features/features.h"
|
|
|
|
|
|
|
|
|
|
-#if defined(OS_NACL)
|
|
|
|
|
+#if defined(OS_NACL) || BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
|
|
|
|
#include "base/hash/md5_nacl.h"
|
|
|
|
|
#else
|
|
|
|
|
#include "base/hash/md5_boringssl.h"
|
