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

third_party/mesa/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/ui.gni")
 
 config("mesa_headers_config") {
   include_dirs = [ "src/include" ]
   if (!use_x11) {
     defines = [ "MESA_EGL_NO_X11_HEADERS" ]
@@ skipping 658 matching lines @@
       # Because we're building as a static library
       "_GLAPI_NO_EXPORTS",
     ]
   }
 
   deps = [
     ":mesa_headers",
   ]
 }
 
-if (!is_android) {  # TODO(GYP) enable for Android.
-  # Building this target will hide the native OpenGL shared library and
-  # replace it with a slow software renderer.
-  #
-  # Note: on x64 Windows this target gives warnings to the effect of:
-  #   osmesa.osmesa.obj : warning LNK4197: export 'OSMesaGetIntegerv' specified
-  #   multiple times; using first specification
-  # This also happens with the GYP build.
-  loadable_module("osmesa") {
-    sources = [
-      "src/src/mesa/drivers/common/driverfuncs.c",
-      "src/src/mesa/drivers/common/driverfuncs.h",
-      "src/src/mesa/drivers/common/meta.c",
-      "src/src/mesa/drivers/common/meta.h",
-      "src/src/mesa/drivers/osmesa/osmesa.c",
+# Building this target will hide the native OpenGL shared library and
+# replace it with a slow software renderer.
+#
+# Note: on x64 Windows this target gives warnings to the effect of:
+#   osmesa.osmesa.obj : warning LNK4197: export 'OSMesaGetIntegerv' specified
+#   multiple times; using first specification
+# This also happens with the GYP build.
+loadable_module("osmesa") {
+  sources = [
+    "src/src/mesa/drivers/common/driverfuncs.c",
+    "src/src/mesa/drivers/common/driverfuncs.h",
+    "src/src/mesa/drivers/common/meta.c",
+    "src/src/mesa/drivers/common/meta.h",
+    "src/src/mesa/drivers/osmesa/osmesa.c",
+  ]
+
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [
+    ":mesa_headers_config",
+    "//build/config/compiler:no_chromium_code",
+  ]
+  previous_configs = configs
+  configs = []
+  configs = [ ":mesa_internal_config" ] + previous_configs +
+            [ ":mesa_internal_warnings" ]
+
+  include_dirs = [ "src/src/mesa/drivers" ]
+
+  if (is_clang) {
+    # Mesa triggers some of these Clang warnings.
+    configs -= [ "//build/config/clang:extra_warnings" ]
+  }
+
+  if (is_win) {
+    ldflags = [ "/DEF:" + rebase_path("src/src/mesa/drivers/osmesa/osmesa.def",
+                                      root_build_dir) ]
+  }
+
+  deps = [
+    ":mesa",
+    ":mesa_headers",
+    ":mesa_libglslcommon",
+    "//build/config/sanitizers:deps",
+  ]
+
+  if (is_win) {
+    defines = [
+      "BUILD_GL32",
+      "KEYWORD1=GLAPI",
+      "KEYWORD2=GLAPIENTRY",
     ]
-
-    configs -= [ "//build/config/compiler:chromium_code" ]
-    configs += [
-      ":mesa_headers_config",
-      "//build/config/compiler:no_chromium_code",
-    ]
-    previous_configs = configs
-    configs = []
-    configs = [ ":mesa_internal_config" ] + previous_configs +
-              [ ":mesa_internal_warnings" ]
-
-    include_dirs = [ "src/src/mesa/drivers" ]
-
-    if (is_clang) {
-      # Mesa triggers some of these Clang warnings.
-      configs -= [ "//build/config/clang:extra_warnings" ]
-    }
-
-    if (is_win) {
-      ldflags =
-          [ "/DEF:" + rebase_path("src/src/mesa/drivers/osmesa/osmesa.def",
-                                  root_build_dir) ]
-    }
-
-    deps = [
-      ":mesa",
-      ":mesa_headers",
-      ":mesa_libglslcommon",
-      "//build/config/sanitizers:deps",
-    ]
-
-    if (is_win) {
-      defines = [
-        "BUILD_GL32",
-        "KEYWORD1=GLAPI",
-        "KEYWORD2=GLAPIENTRY",
-      ]
-    }
   }
-} else {
-  #  Placeholder to allow targets to unconditionally depend on this.
-  group("osmesa") {
-  }
-}  # !is_android
-
-# TODO(GYP) Android osmesa_in_lib_dir target.
+}
 
 if (is_linux) {
   config("wayland_drm_protocol_config") {
     include_dirs = [ "$generated_src_dir/egl/wayland/wayland-drm" ]
   }
 
   source_set("wayland_drm_protocol") {
     sources = [
       "$generated_src_dir/egl/wayland/wayland-drm/wayland-drm-client-protocol.h",
       "$generated_src_dir/egl/wayland/wayland-drm/wayland-drm-protocol.c",
       "$generated_src_dir/egl/wayland/wayland-drm/wayland-drm-server-protocol.h",
     ]
 
     deps = [
       "//third_party/wayland:wayland_util",
     ]
 
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [ "//build/config/compiler:no_chromium_code" ]
 
     public_configs = [ ":wayland_drm_protocol_config" ]
   }
 }