Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Unified Diff: content/content_shell.gypi

Issue 23868030: Make it possible to use OSMesa on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 9a9537f5b283541634fed70b920ef6f61c156218..548a2b3d9d2d3b3f486f710760adc254b765c287 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -1049,6 +1049,7 @@
'../base/base.gyp:base_java',
'../media/media.gyp:media_java',
'../net/net.gyp:net_java',
+ '../third_party/mesa/mesa.gyp:osmesa_in_lib_dir',
'../tools/android/forwarder/forwarder.gyp:forwarder',
'../ui/android/ui_android.gyp:ui_java',
],
@@ -1060,6 +1061,7 @@
'native_lib_target': 'libcontent_shell_content_view',
'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
+ 'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'],
},
'conditions': [
['android_webview_build==0', {
« no previous file with comments | « no previous file | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698