summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_common.gypi
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 12:05:27 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 12:05:27 +0000
commitf59f33e86bac268369be9875d13199ff36bc192b (patch)
tree1b8de818fc6b07c1c86111c6632d5afea6b4a539 /chrome/chrome_common.gypi
parentf1d29c0cd064f9c75f03d189d013591140185d14 (diff)
downloadchromium_src-f59f33e86bac268369be9875d13199ff36bc192b.zip
chromium_src-f59f33e86bac268369be9875d13199ff36bc192b.tar.gz
chromium_src-f59f33e86bac268369be9875d13199ff36bc192b.tar.bz2
Adding 'base_prefs' target to base/gypi.
BUG=155525 Review URL: https://chromiumcodereview.appspot.com/11336034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
-rw-r--r--chrome/chrome_common.gypi9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 2b79b98..0934725 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -29,6 +29,7 @@
'metrics_proto',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_i18n',
+ '<(DEPTH)/base/base.gyp:base_prefs',
'<(DEPTH)/base/base.gyp:base_static',
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
@@ -317,14 +318,6 @@
'common/zip_internal.h',
'common/zip_reader.cc',
'common/zip_reader.h',
-
- # TODO(joi): Move to 'base_prefs' target in base/base.gyp once
- # Prefs move is complete and dependencies have been broken.
- '../base/prefs/json_pref_store.cc',
- '../base/prefs/json_pref_store.h',
- '../base/prefs/persistent_pref_store.h',
- '../base/prefs/pref_store.cc',
- '../base/prefs/pref_store.h',
],
'conditions': [
['OS != "ios"', {