GN(Android): Add libosmesa.so to ContentShell.apk

content/shell/android/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build_overrides/v8.gni")
 import("//third_party/icu/config.gni")
 
 generate_jni("content_shell_jni_headers") {
@@ skipping 93 matching lines @@
     ":content_shell_apk_java",
     ":content_shell_apk_resources",
     ":content_shell_assets",
     ":content_shell_java",
     ":content_shell_manifest",
     ":libcontent_shell_content_view",
     "//base:base_java",
     "//content/public/android:content_java",
     "//media/base/android:media_java",
     "//net/android:net_java",
-
-    #"//third_party/mesa:osmesa_in_lib_dir",
+    "//third_party/mesa:osmesa",
     "//ui/android:ui_java",
   ]
   apk_name = "ContentShell"
   android_manifest = content_shell_manifest
   native_libs = [ "libcontent_shell_content_view.so" ]
-
-  # TODO(GYP)
-  #'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'],
+  loadable_modules = [ "$root_out_dir/libosmesa.so" ]
 }
 
 android_library("content_shell_test_java") {
   testonly = true
   deps = [
     ":content_shell_apk_java",
     ":content_shell_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//content/public/android:content_java",
@@ skipping 93 matching lines @@
   testonly = true
   deps = [
     ":content_shell_java",
     "//base:base_java",
     "//content/public/android:content_java",
     "//testing/android/native_test:native_test_java",
     "//ui/android:ui_java",
   ]
   DEPRECATED_java_in_dir = "browsertests/src"
 }