Address more TODO(GYP) in the GN build.

components/mus/ws/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")
 import("//testing/test.gni")
 import("//mojo/public/mojo_application.gni")
 import("//mojo/public/mojo_application_manifest.gni")
 
 source_set("lib") {
@@ skipping 204 matching lines @@
     "//mojo/converters/input_events",
     "//mojo/converters/transform",
     "//mojo/gles2",
     "//mojo/platform_handle:for_component",
     "//mojo/public/cpp/bindings:bindings",
     "//services/shell/public/cpp:shell_test_support",
     "//services/shell/public/cpp:sources",
     "//services/shell/public/cpp/test:run_all_shelltests",
     "//services/shell/public/interfaces",
     "//testing/gtest",
+    "//third_party/mesa:osmesa",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/geometry:util",
   ]
 
-  if (!is_android) {  # TODO(GYP) Enable on Android when osmesa links.
-    deps += [ "//third_party/mesa:osmesa" ]
-  }
-
   if (use_x11) {
     deps += [ "//tools/xdisplaycheck" ]
   }
 
   data_deps = [
     ":mus_ws_unittests_app_manifest",
   ]
 }
 
 mojo_application_manifest("mus_ws_unittests_app_manifest") {
   application_name = "mus_ws_unittests_app"
   source = "mus_ws_unittests_app_manifest.json"
 }