diff options
| author | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-03 18:24:54 +0000 |
|---|---|---|
| committer | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-03 18:24:54 +0000 |
| commit | 01587e14cf8673294cb1fb6b1ace8717cd63f164 (patch) | |
| tree | 8730aed7e35214ea6a2f2c0d52681b770f1d2951 /build | |
| parent | cd640a0e7c5542d4f5573f472d82eec3fbf3a4c8 (diff) | |
| download | chromium_src-01587e14cf8673294cb1fb6b1ace8717cd63f164.zip chromium_src-01587e14cf8673294cb1fb6b1ace8717cd63f164.tar.gz chromium_src-01587e14cf8673294cb1fb6b1ace8717cd63f164.tar.bz2 | |
Build components and run components_tests on iOS
This CL also adds a missing iOS string that was preventing dom_distiller from compiling on iOS.
BUG=NONE
Review URL: https://codereview.chromium.org/25706003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 4 | ||||
| -rw-r--r-- | build/ios/grit_whitelist.txt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index 4839931..02660dc 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -12,6 +12,7 @@ 'some.gyp:*', '../base/base.gyp:*', '../chrome/chrome.gyp:*', + '../components/components.gyp:*', '../content/content.gyp:*', '../crypto/crypto.gyp:*', '../mojo/mojo.gyp:*', @@ -33,7 +34,6 @@ ['OS!="ios"', { 'dependencies': [ '../cc/cc_tests.gyp:*', - '../components/components.gyp:*', '../device/bluetooth/bluetooth.gyp:*', '../device/device_tests.gyp:*', '../device/usb/usb.gyp:*', @@ -212,6 +212,7 @@ 'dependencies': [ '../base/base.gyp:base_unittests', '../chrome/chrome.gyp:unit_tests', + '../components/components.gyp:components_unittests', '../crypto/crypto.gyp:crypto_unittests', '../net/net.gyp:net_unittests', '../sql/sql.gyp:sql_unittests', @@ -231,7 +232,6 @@ '../chrome/chrome.gyp:interactive_ui_tests', '../chrome/chrome.gyp:sync_integration_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', - '../components/components.gyp:components_unittests', '../content/content.gyp:content_browsertests', '../content/content.gyp:content_shell', '../content/content.gyp:content_unittests', diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt index 359e3a0..d2fa6b7 100644 --- a/build/ios/grit_whitelist.txt +++ b/build/ios/grit_whitelist.txt @@ -239,6 +239,7 @@ IDS_DEFAULT_TAB_TITLE IDS_DELETE IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION IDS_DISABLE_TOUCH_ADJUSTMENT_NAME +IDS_DOM_DISTILLER_TITLE IDS_DONE IDS_EDIT_FIND_MAC IDS_EMPTY_KEYWORD_VALUE |