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

Unified Diff: chromeos/chromeos.gyp

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit tests Created 8 years 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
« no previous file with comments | « chromeos/DEPS ('k') | chromeos/chromeos_test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/chromeos.gyp
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index d8ce661738f7a17486727a4cbe5aeececb12d227..fbe4497bceccdecf9b21cd618a4eb89a83074877 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -13,6 +13,7 @@
'dependencies': [
'../base/base.gyp:base',
'../build/linux/system.gyp:dbus',
+ '../build/linux/system.gyp:ssl',
'../dbus/dbus.gyp:dbus',
'../net/net.gyp:net',
'../third_party/libxml/libxml.gyp:libxml',
@@ -142,6 +143,27 @@
'network/network_state_handler.h',
'network/network_state_handler_observer.cc',
'network/network_state_handler_observer.h',
+ 'network/onc/onc_certificate_importer.cc',
+ 'network/onc/onc_certificate_importer.h',
+ 'network/onc/onc_constants.cc',
+ 'network/onc/onc_constants.h',
+ 'network/onc/onc_mapper.cc',
+ 'network/onc/onc_mapper.h',
+ 'network/onc/onc_merger.cc',
+ 'network/onc/onc_merger.h',
+ 'network/onc/onc_normalizer.cc',
+ 'network/onc/onc_normalizer.h',
+ 'network/onc/onc_signature.cc',
+ 'network/onc/onc_signature.h',
+ 'network/onc/onc_translation_tables.cc',
+ 'network/onc/onc_translation_tables.h',
+ 'network/onc/onc_translator.h',
+ 'network/onc/onc_translator_onc_to_shill.cc',
+ 'network/onc/onc_translator_shill_to_onc.cc',
+ 'network/onc/onc_utils.cc',
+ 'network/onc/onc_utils.h',
+ 'network/onc/onc_validator.cc',
+ 'network/onc/onc_validator.h',
'network/shill_property_handler.cc',
'network/shill_property_handler.h',
'network/shill_service_observer.cc',
@@ -166,6 +188,8 @@
'chromeos',
],
'sources': [
+ 'chromeos_test_utils.cc',
+ 'chromeos_test_utils.h',
'cryptohome/mock_async_method_caller.cc',
'cryptohome/mock_async_method_caller.h',
'dbus/mock_bluetooth_adapter_client.cc',
@@ -263,7 +287,10 @@
'../base/base.gyp:run_all_unittests',
'../base/base.gyp:test_support_base',
'../build/linux/system.gyp:dbus',
+ '../build/linux/system.gyp:ssl',
+ '../crypto/crypto.gyp:crypto',
'../dbus/dbus.gyp:dbus_test_support',
+ '../net/net.gyp:net',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'chromeos_test_support',
@@ -298,6 +325,14 @@
'network/network_event_log_unittest.cc',
'network/network_sms_handler_unittest.cc',
'network/network_state_handler_unittest.cc',
+ 'network/onc/onc_certificate_importer_unittest.cc',
+ 'network/onc/onc_merger_unittest.cc',
+ 'network/onc/onc_normalizer_unittest.cc',
+ 'network/onc/onc_test_utils.cc',
+ 'network/onc/onc_test_utils.h',
+ 'network/onc/onc_translator_unittest.cc',
+ 'network/onc/onc_utils_unittest.cc',
+ 'network/onc/onc_validator_unittest.cc',
'network/shill_property_handler_unittest.cc',
'power/power_state_override_unittest.cc',
],
« no previous file with comments | « chromeos/DEPS ('k') | chromeos/chromeos_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698