From c604a55498cea3b78c4eafda2cb408fd16edf6af Mon Sep 17 00:00:00 2001 From: "robertshield@chromium.org" Date: Mon, 22 Mar 2010 20:12:50 +0000 Subject: Allowing MSI mode detection to work from the master preferences file. Refactor the piece of master preferences code that was in setup_util.h|cc (setup) into master_preferences.h|cc (install_util). This adds an install_util -> googleurl dependency, which should to be fine. Add in master_preferences_dummy.cc to keep the nacl64 stuff compiling happily. Add values.h|cc to the portion of base built in 64 bit mode and add a minor fix to values.cc to make it build. Also refactor accompanying master_preferences test code from setup tests to install_util tests. BUG=19370 Review URL: http://codereview.chromium.org/979003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42248 0039d316-1c4b-4281-b951-d872f2087c98 --- base/base.gypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'base/base.gypi') diff --git a/base/base.gypi b/base/base.gypi index 3325b63..eb99848 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -254,6 +254,8 @@ 'utf_string_conversions.cc', 'utf_string_conversions.h', 'unix_domain_socket_posix.cc', + 'values.cc', + 'values.h', 'waitable_event.h', 'waitable_event_posix.cc', 'waitable_event_watcher.h', @@ -548,8 +550,6 @@ 'sync_socket_posix.cc', 'time_mac.cc', 'time_posix.cc', - 'values.cc', - 'values.h', 'version.cc', 'version.h', ], -- cgit v1.1