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

Unified Diff: chrome/chrome_browser.gypi

Issue 8591035: Clean up disable_nacl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 697d885c4f281f178041f549b1c23776e649b006..17d6b24bdc066bd03af31747bc46fe08c7979c50 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1546,12 +1546,6 @@
'browser/metrics/thread_watcher.h',
'browser/mock_keychain_mac.cc',
'browser/mock_keychain_mac.h',
- 'browser/nacl_host/nacl_broker_host_win.cc',
- 'browser/nacl_host/nacl_broker_host_win.h',
- 'browser/nacl_host/nacl_broker_service_win.cc',
- 'browser/nacl_host/nacl_broker_service_win.h',
- 'browser/nacl_host/nacl_process_host.cc',
- 'browser/nacl_host/nacl_process_host.h',
'browser/native_window_notification_source.h',
'browser/net/browser_url_util.cc',
'browser/net/browser_url_util.h',
@@ -3997,6 +3991,16 @@
'<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
],
'conditions': [
+ ['disable_nacl==0', {
+ 'sources': [
+ 'browser/nacl_host/nacl_broker_host_win.cc',
+ 'browser/nacl_host/nacl_broker_host_win.h',
+ 'browser/nacl_host/nacl_broker_service_win.cc',
+ 'browser/nacl_host/nacl_broker_service_win.h',
+ 'browser/nacl_host/nacl_process_host.cc',
+ 'browser/nacl_host/nacl_process_host.h',
+ ],
+ }],
['buildtype=="Official"', {
'sources!': [
'browser/protector/keys.cc',
« no previous file with comments | « chrome/browser/renderer_host/chrome_render_message_filter.cc ('k') | chrome/renderer/chrome_ppapi_interfaces.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698