Work on the Android GN build.

BUILD.gn

 # Copyright (c) 2013 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.
 
 # This is the root build file for GN. GN will start processing by loading this
 # file, and recursively load all dependencies until all dependencies are either
 # resolved or known not to exist (which will cause the build to fail). So if
 # you add a new build file, there must be some path of dependencies from this
 # file to your new one or GN won't know about it.
 
@@ skipping 51 matching lines @@
     # fixed and rolled into Chrome.
     #"//third_party/WebKit/Source/platform",
     "//third_party/WebKit/Source/wtf",
     "//third_party/zlib",
     "//third_party:jpeg",
     "//tools/gn",
     "//ui/accessibility",
     "//ui/base:ui_base",
     "//ui/events",
     "//ui/gfx",
+    "//ui/gl",
     "//ui/resources",
     "//ui/strings",
     "//ui/surface",
     "//url",
     "//v8:mksnapshot",
   ]
 
   if (is_linux) {
     deps += [
       "//third_party/freetype2",
     ]
   }
 
   if (is_android) {
     deps -= [
       "//content/public/common",
-      "//gpu/command_buffer/client",  # Needs some JNI stuff:
-      "//gpu/command_buffer/service",
-      "//net",
       "//third_party/libusb",
       #"//third_party/WebKit/Source/platform",
       "//third_party/WebKit/Source/wtf",  # TODO(brettw) re-enable for Android.
       "//tools/gn",
 
-      # ui_base doesn't work yet, and neither do things that depend on it.
-      "//ui/base:ui_base",
-      "//ui/events",
+      # This stuff all depends on ui/surface which requires some .class jni
+      # generators (ui/gl/gl.gyp:surface_jni_headers).
+      "//ui/gl",
+      "//gpu/command_buffer/client",
+      "//gpu/command_buffer/service",
       "//ui/surface",
     ]
   }
 }