Make it possible to use OSMesa on Android

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 233a7c4ebab1626e38a2920c1d95c9323229cb24..b2365f78bb71e3038648d85a8f09132359c7264b 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -727,6 +727,7 @@
             '../base/base.gyp:base_java',
             '../media/media.gyp:media_java',
             '../net/net.gyp:net_java',
+            '../third_party/mesa/mesa.gyp:osmesa',
             '../tools/android/forwarder/forwarder.gyp:forwarder',
             '../tools/android/md5sum/md5sum.gyp:md5sum',
             '../ui/ui.gyp:ui_java',
@@ -739,7 +740,24 @@
             'native_lib_target': 'libcontent_shell_content_view',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(ant_build_out)/content_shell/assets',
+            'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'],
           },
+          'actions': [
+            {
+              # Copy libosmesa.so to the out/$BUILDTYPE/lib/ directory. The
+              # write_ordered_libraries.py script requires it to be in that
+              # directory, because otherwise it will be seen as a system lib
+              # which causes it to not be stripped.
+              'action_name': 'copy_libosmesa',
+              'inputs': ['<(PRODUCT_DIR)/libosmesa.so'],
+              'outputs': ['<(SHARED_LIB_DIR)/libosmesa.so'],
+              'action': [
+                'cp',
+                '<(PRODUCT_DIR)/libosmesa.so',
+                '<(SHARED_LIB_DIR)/libosmesa.so',
+              ],
+            },
+          ],
           'conditions': [
             ['android_webview_build==0', {
               'dependencies': [