diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-09-19 22:36:51 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-09-19 22:36:51 +0100 |
| commit | d0247b1b59f9c528cb6df88b4f2b9afaf80d181e (patch) | |
| tree | 5c397fadc190cc71bffe2ffad1efc27a5b95309d /chrome/chrome_common.gypi | |
| parent | f7571f5f07547e2f3e0addf48d1f2a7ec3632957 (diff) | |
| download | chromium_org-d0247b1b59f9c528cb6df88b4f2b9afaf80d181e.tar.gz | |
Merge from Chromium at DEPS revision 224184
This commit was generated by merge_to_master.py.
Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
Diffstat (limited to 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 735ba88e2e..c0ef0f382f 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -180,6 +180,8 @@ 'common/descriptors_android.h', 'common/dump_without_crashing.cc', 'common/dump_without_crashing.h', + 'common/encrypted_media_messages_android.cc', + 'common/encrypted_media_messages_android.h', 'common/extensions/api/commands/commands_handler.cc', 'common/extensions/api/commands/commands_handler.h', 'common/extensions/api/extension_action/action_info.cc', @@ -244,8 +246,6 @@ 'common/extensions/extension_icon_set.h', 'common/extensions/extension_l10n_util.cc', 'common/extensions/extension_l10n_util.h', - 'common/extensions/extension_manifest_constants.cc', - 'common/extensions/extension_manifest_constants.h', 'common/extensions/extension_messages.cc', 'common/extensions/extension_messages.h', 'common/extensions/extension_process_policy.cc', |