Update base to extend NaCl support (needed for skia support)
TEST="Let //base/process include memory.h, but do not make any changes to
memory.cc. Run `./mojo/tools/mojob.py build`. Observe a link error. Add
the UncheckedMalloc definition to memory.cc. Observe the link error is gone"
BUG=#431
R=phosek@chromium.org
Review URL: https://codereview.chromium.org/1531443002 .
diff --git a/memory/BUILD.gn b/memory/BUILD.gn
index c344279..c53cc05 100644
--- a/memory/BUILD.gn
+++ b/memory/BUILD.gn
@@ -46,10 +46,6 @@
if (is_nacl) {
sources -= [
- "discardable_memory.cc",
- "discardable_memory.h",
- "discardable_memory_allocator.cc",
- "discardable_memory_allocator.h",
"discardable_shared_memory.cc",
"discardable_shared_memory.h",
"shared_memory_posix.cc",
diff --git a/process/BUILD.gn b/process/BUILD.gn
index 814459b..a362cbb 100644
--- a/process/BUILD.gn
+++ b/process/BUILD.gn
@@ -85,8 +85,6 @@
"launch.cc",
"launch.h",
"launch_posix.cc",
- "memory.cc",
- "memory.h",
"process_iterator.cc",
"process_iterator.h",
"process_metrics.cc",
diff --git a/process/memory.cc b/process/memory.cc
index 133a72a..6214f7f 100644
--- a/process/memory.cc
+++ b/process/memory.cc
@@ -45,4 +45,11 @@
#endif
+#if defined(OS_NACL)
+bool UncheckedMalloc(size_t size, void** result) {
+ *result = malloc(size);
+ return *result != NULL;
+}
+#endif
+
} // namespace base
