diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 00:59:16 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 00:59:16 +0000 |
| commit | f38f2c90e8b88a8bd0197a319539be996f7ca048 (patch) | |
| tree | 94a872e3c03e4601cb9e4c0aeca880f09ab97f55 | |
| parent | 20b3df63531bf7f1962333400cf11322eff000a7 (diff) | |
| download | chromium_src-f38f2c90e8b88a8bd0197a319539be996f7ca048.zip chromium_src-f38f2c90e8b88a8bd0197a319539be996f7ca048.tar.gz chromium_src-f38f2c90e8b88a8bd0197a319539be996f7ca048.tar.bz2 | |
[Android] Fix unit_tests and webview compilations for components build.
What I missed in https://codereview.chromium.org/13494003/ is that
jingle is also needed for unit tests. Other variants get it
transitivitely through the 'service' process/target which is unused on
Android.
Also fixes a regression in component build for android_webview after
some changes there.
BUG=158821
Review URL: https://chromiumcodereview.appspot.com/14099007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193813 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | android_webview/android_webview.gyp | 1 | ||||
| -rw-r--r-- | chrome/chrome_android.gypi | 1 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 1 | ||||
| -rw-r--r-- | gpu/command_buffer/client/gpu_memory_buffer_factory.h | 3 |
4 files changed, 4 insertions, 2 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 32c1fa6..52c84ad 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -84,6 +84,7 @@ '../components/components.gyp:web_contents_delegate_android', '../content/content.gyp:content', '../skia/skia.gyp:skia', + '../gpu/gpu.gyp:gles2_implementation', '../ui/gl/gl.gyp:gl', 'android_webview_pak', ], diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi index 7cbc1ab..1d4de15 100644 --- a/chrome/chrome_android.gypi +++ b/chrome/chrome_android.gypi @@ -102,7 +102,6 @@ 'chrome.gyp:renderer', 'chrome.gyp:utility', '../content/content.gyp:content', - '../jingle/jingle.gyp:notifier', ], 'include_dirs': [ '..', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 140fec2..61c41cd 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -36,6 +36,7 @@ '../content/content.gyp:content_common', '../crypto/crypto.gyp:crypto', '../google_apis/google_apis.gyp:google_apis', + '../jingle/jingle.gyp:notifier', '../media/media.gyp:media', '../skia/skia.gyp:skia', '../sql/sql.gyp:sql', diff --git a/gpu/command_buffer/client/gpu_memory_buffer_factory.h b/gpu/command_buffer/client/gpu_memory_buffer_factory.h index 5f0e31b..a2df559 100644 --- a/gpu/command_buffer/client/gpu_memory_buffer_factory.h +++ b/gpu/command_buffer/client/gpu_memory_buffer_factory.h @@ -6,6 +6,7 @@ #define GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_FACTORY_H_ #include "ui/gl/gpu_memory_buffer.h" +#include "gles2_impl_export.h" namespace gpu { @@ -17,7 +18,7 @@ namespace gpu { const gfx::GpuMemoryBuffer::Creator& GetProcessDefaultGpuMemoryBufferFactory(); // It is illegal to call the setter more than once. -void SetProcessDefaultGpuMemoryBufferFactory( +GLES2_IMPL_EXPORT void SetProcessDefaultGpuMemoryBufferFactory( const gfx::GpuMemoryBuffer::Creator& factory); } // namespace gpu |