Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(350)

Unified Diff: base/base.gypi

Issue 10795083: Enable some parts of base that were previously disabled in base_untrusted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 5fdbe9793f7c29b6f86618a94d3863205b94fd2e..44049e5bdfab8d2d149170aca2346ddb92ba8671 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -63,6 +63,8 @@
'base_paths_win.cc',
'base_paths_win.h',
'base_switches.h',
+ 'base64.cc',
+ 'base64.h',
'basictypes.h',
'bind.h',
'bind_helpers.cc',
@@ -297,6 +299,7 @@
'property_bag.h',
'rand_util.cc',
'rand_util.h',
+ 'rand_util_nacl.cc',
'rand_util_posix.cc',
'rand_util_win.cc',
'run_loop.cc',
@@ -332,6 +335,8 @@
'string_util.h',
'string_util_posix.h',
'string_util_win.h',
+ 'string16.cc',
+ 'string16.h',
'stringize_macros.h',
'stringprintf.cc',
'stringprintf.h',
@@ -419,6 +424,7 @@
'threading/worker_pool_win.cc',
'time.cc',
'time.h',
+ 'time_posix.cc',
'time_win.cc',
'timer.cc',
'timer.h',
@@ -529,7 +535,6 @@
'command_line.cc',
'cpu.cc',
'debug/stack_trace_posix.cc',
- 'environment.cc',
'file_util.cc',
'file_util_posix.cc',
'file_util_proxy.cc',
@@ -541,7 +546,6 @@
'process_posix.cc',
'process_util.cc',
'process_util_posix.cc',
- 'rand_util.cc',
'rand_util_posix.cc',
'scoped_native_library.cc',
'scoped_temp_dir.cc',
@@ -655,6 +659,16 @@
['exclude', '^chromeos/'],
],
}],
+ ['>(nacl_untrusted_build)==1', {
+ 'sources/': [
+ ['include', 'synchronization/.*_posix\\.cc$'],
+ ['include', 'threading/.*_posix\\.cc$'],
+ ['include', 'time_posix\\.cc$'],
+ ['include', 'safe_strerror_posix\\.cc$'],
+ ['include', 'atomicops_internals_x86_gcc\\.cc$'],
+ ['include', 'debugger_posix\\.cc$'],
+ ],
+ }],
],
}],
],
« no previous file with comments | « base/base.gyp ('k') | base/base_untrusted.gyp » ('j') | base/rand_util_nacl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698