summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 20:00:20 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 20:00:20 +0000
commit93d49d70b89b22ec46d0b00b7950297f64865d56 (patch)
tree3243e0209c738df0c18c2ba615667f757fcaec94 /base/base.gyp
parenta9f607e33a91604bc63bd8c846aefbda9bf0dfa9 (diff)
downloadchromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.zip
chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.tar.gz
chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.tar.bz2
Move the json-related files into a separate json directory. This hopefully also
makes the naming of string_escape more clear (it's actually JSON-specific). Move the files into the base namespace. TEST=none BUG=none Review URL: http://codereview.chromium.org/316016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp18
1 files changed, 9 insertions, 9 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 2ca5cfb..6f6790c 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -149,10 +149,12 @@
'id_map.h',
'image_util.cc',
'image_util.h',
- 'json_reader.cc',
- 'json_reader.h',
- 'json_writer.cc',
- 'json_writer.h',
+ 'json/json_reader.cc',
+ 'json/json_reader.h',
+ 'json/json_writer.cc',
+ 'json/json_writer.h',
+ 'json/string_escape.cc',
+ 'json/string_escape.h',
'keyboard_code_conversion_gtk.cc',
'keyboard_code_conversion_gtk.h',
'keyboard_codes.h',
@@ -279,8 +281,6 @@
'stl_util-inl.h',
'string16.cc',
'string16.h',
- 'string_escape.cc',
- 'string_escape.h',
'string_piece.cc',
'string_piece.h',
'string_tokenizer.h',
@@ -578,8 +578,9 @@
'i18n/file_util_icu_unittest.cc',
'i18n/icu_string_conversions_unittest.cc',
'i18n/word_iterator_unittest.cc',
- 'json_reader_unittest.cc',
- 'json_writer_unittest.cc',
+ 'json/json_reader_unittest.cc',
+ 'json/json_writer_unittest.cc',
+ 'json/string_escape_unittest.cc',
'lazy_instance_unittest.cc',
'leak_tracker_unittest.cc',
'linked_list_unittest.cc',
@@ -607,7 +608,6 @@
'singleton_unittest.cc',
'stack_container_unittest.cc',
'stats_table_unittest.cc',
- 'string_escape_unittest.cc',
'string_piece_unittest.cc',
'string_tokenizer_unittest.cc',
'string_util_unittest.cc',