diff options
| author | danduong <danduong@chromium.org> | 2014-09-22 19:50:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-23 02:50:09 +0000 |
| commit | d817896458c8d1eaea1e09b3549126ab52658e3d (patch) | |
| tree | 77aabd7f52649b5facd82e8a0ba151afefde357c /chrome/chrome_browser.gypi | |
| parent | 1511c019fae487232a2b8402c27a2834be2491e3 (diff) | |
| download | chromium_src-d817896458c8d1eaea1e09b3549126ab52658e3d.zip chromium_src-d817896458c8d1eaea1e09b3549126ab52658e3d.tar.gz chromium_src-d817896458c8d1eaea1e09b3549126ab52658e3d.tar.bz2 | |
Add BookmarkUndoService to Android build
Adding build support and JNI hooks for undoing
bookmark actions.
BUG=415411
Review URL: https://codereview.chromium.org/586913002
Cr-Commit-Position: refs/heads/master@{#296135}
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index b24537d..e847295 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2162,14 +2162,6 @@ 'browser/sync/sync_ui_util.h', 'browser/tab_contents/background_contents.cc', 'browser/tab_contents/background_contents.h', - 'browser/undo/bookmark_undo_service.cc', - 'browser/undo/bookmark_undo_service_factory.cc', - 'browser/undo/bookmark_undo_service_factory.h', - 'browser/undo/bookmark_undo_service.h', - 'browser/undo/bookmark_undo_utils.cc', - 'browser/undo/bookmark_undo_utils.h', - 'browser/undo/undo_manager.cc', - 'browser/undo/undo_manager.h', ], # Cross-platform Aura files. 'chrome_browser_aura_sources': [ @@ -2320,6 +2312,16 @@ 'browser/supervised_user/supervised_user_url_filter.h', 'browser/supervised_user/supervised_users.h', ], + 'chrome_browser_undo_sources': [ + 'browser/undo/bookmark_undo_service.cc', + 'browser/undo/bookmark_undo_service_factory.cc', + 'browser/undo/bookmark_undo_service_factory.h', + 'browser/undo/bookmark_undo_service.h', + 'browser/undo/bookmark_undo_utils.cc', + 'browser/undo/bookmark_undo_utils.h', + 'browser/undo/undo_manager.cc', + 'browser/undo/undo_manager.h', + ], 'chrome_browser_webrtc_sources': [ # TODO(brettw) should webrtc_log_list.cc go here? 'browser/media/webrtc_log_uploader.cc', @@ -2876,6 +2878,10 @@ '../sql/sql.gyp:sql', '../sync/sync.gyp:sync', ], + # sources applied to all configurations + 'sources': [ + '<@(chrome_browser_undo_sources)', + ], 'conditions': [ ['OS != "ios"', { 'dependencies': [ |