diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-18 00:02:13 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-18 00:02:13 +0000 |
| commit | b50368b40bb6ef5aaef548bd488119533f287a39 (patch) | |
| tree | 300b40bc66fcb94cf030c7e1fe11fda4e0991afc /chrome/chrome_common.gypi | |
| parent | 26934aecea06513fc5e826578646c33fc37d1839 (diff) | |
| download | chromium_src-b50368b40bb6ef5aaef548bd488119533f287a39.zip chromium_src-b50368b40bb6ef5aaef548bd488119533f287a39.tar.gz chromium_src-b50368b40bb6ef5aaef548bd488119533f287a39.tar.bz2 | |
Add the ability to use a bundled Flapper.
This change needs more build-time support to actually make it happen.
Review URL: http://codereview.chromium.org/9406028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122635 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 3415464..dbee54b 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -15,6 +15,7 @@ }, 'include_dirs': [ '..', + '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_content_client.cc. ], 'direct_dependent_settings': { 'include_dirs': [ @@ -42,6 +43,7 @@ '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/printing/printing.gyp:printing', '<(DEPTH)/skia/skia.gyp:skia', + '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h', '<(DEPTH)/third_party/bzip2/bzip2.gyp:bzip2', '<(DEPTH)/third_party/icu/icu.gyp:icui18n', '<(DEPTH)/third_party/icu/icu.gyp:icuuc', |