| Index: trunk/src/components/user_manager.gypi
|
| ===================================================================
|
| --- trunk/src/components/user_manager.gypi (revision 284418)
|
| +++ trunk/src/components/user_manager.gypi (working copy)
|
| @@ -16,8 +16,6 @@
|
| ],
|
| # Chrome OS user_manager sources.
|
| 'user_manager_chromeos_sources': [
|
| - 'user_manager/user_image/default_user_images.cc',
|
| - 'user_manager/user_image/default_user_images.h',
|
| 'user_manager/user_image/user_image.cc',
|
| 'user_manager/user_image/user_image.h',
|
| 'user_manager/user_type.h',
|
| @@ -27,26 +25,20 @@
|
| 'target_name': 'user_manager',
|
| 'type': '<(component)',
|
| 'dependencies': [
|
| - '<(DEPTH)/base/base.gyp:base',
|
| - '<(DEPTH)/skia/skia.gyp:skia',
|
| - '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
|
| - '<(DEPTH)/url/url.gyp:url_lib',
|
| + '../base/base.gyp:base',
|
| + '../skia/skia.gyp:skia',
|
| + '../ui/gfx/gfx.gyp:gfx',
|
| + '../url/url.gyp:url_lib',
|
| ],
|
| 'defines': [
|
| 'USER_MANAGER_IMPLEMENTATION',
|
| ],
|
| 'include_dirs': [
|
| - '<(DEPTH)',
|
| - '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
|
| - '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
|
| + '..',
|
| ],
|
| 'sources': [ '<@(user_manager_shared_sources)' ],
|
| 'conditions': [
|
| ['chromeos == 1', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
|
| - '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
|
| - ],
|
| 'sources': [ '<@(user_manager_chromeos_sources)' ],
|
| }],
|
| ],
|
|
|