Work on the Android GN build.

Fills out more targets in the Android build.

BUG=
R=cjhopman@chromium.org

Review URL: https://codereview.chromium.org/297793004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272574 0039d316-1c4b-4281-b951-d872f2087c98

BUILD.gn

@@ -69,6 +69,7 @@ group("root") {
     "//ui/base:ui_base",
     "//ui/events",
     "//ui/gfx",
+    "//ui/gl",
     "//ui/resources",
     "//ui/strings",
     "//ui/surface",
@@ -85,17 +86,16 @@ group("root") {
   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",
     ]
   }

build/config/crypto.gni

@@ -16,7 +16,7 @@ declare_args() {
 # True when we're using OpenSSL for certificate verification and storage. We
 # only do this when we're using OpenSSL on desktop Linux systems. For other
 # systems (Mac/Win/Android) we use the system certificate features.
-use_openssl_certs = use_openssl && is_linux
+use_openssl_certs = use_openssl && (is_linux || is_android)
 
 # Same meaning as use_openssl_certs but for NSS.
 use_nss_certs = !use_openssl && is_linux

net/BUILD.gn

@@ -290,6 +290,14 @@ component("net") {
         "base/openssl_private_key_store_android.cc",
       ]
     }
+  } else if (is_android) {
+    # Android doesn't use these even when using OpenSSL.
+    sources -= [
+      "base/openssl_private_key_store_memory.cc",
+      "cert/cert_database_openssl.cc",
+      "cert/cert_verify_proc_openssl.cc",
+      "cert/test_root_certs_openssl.cc",
+    ]
   }
 
   if (use_glib) {

ui/base/BUILD.gn

@@ -302,6 +302,7 @@ component("ui_base") {
     sources -= [
       "cursor/cursor.cc",
       "cursor/cursor.h",
+      "dragdrop/drag_utils_aura.cc",
       "x/selection_owner.cc",
       "x/selection_owner.h",
       "x/selection_requestor.cc",
@@ -310,6 +311,13 @@ component("ui_base") {
       "x/selection_utils.h",
     ]
   }
+  if (!use_x11) {
+    sources -= [
+      "x/x11_util.cc",
+      "x/x11_util.h",
+      "x/x11_util_internal.h",
+    ]
+  }
 
   if (!use_aura || !is_linux) {
     sources -= [

ui/events/BUILD.gn

@@ -186,8 +186,6 @@ component("gesture_detection") {
     "gesture_detection/gesture_event_data_packet.cc",
     "gesture_detection/gesture_event_data_packet.h",
     "gesture_detection/gesture_config_helper.h",
-    "gesture_detection/gesture_config_helper_aura.cc",
-    "gesture_detection/gesture_config_helper_android.cc",
     "gesture_detection/gesture_provider.cc",
     "gesture_detection/gesture_provider.h",
     "gesture_detection/motion_event.h",
@@ -216,8 +214,12 @@ component("gesture_detection") {
     deps += [ ":events" ]
   }
 
-  if (!use_aura && !is_android) {
-    sources -= [ "gesture_detection/gesture_config_helper_aura.cc" ]
+  if (is_android) {
+    sources += [ "gesture_detection/gesture_config_helper_android.cc" ]
+  } else if (use_aura) {
+    sources += [ "gesture_detection/gesture_config_helper_aura.cc" ]
+  } else {
+    sources += [ "gesture_detection/gesture_config_helper.cc" ]
   }
 }
 

ui/gl/BUILD.gn

@@ -3,6 +3,9 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
+if (is_android) {
+  import("//build/config/android/rules.gni")
+}
 
 gl_binding_output_dir = target_gen_dir
 
@@ -222,6 +225,10 @@ component("gl") {
     ]
 
     libs = [ "android" ]
+
+    deps += [
+      ":gl_jni_headers",
+    ]
   }
   if (use_ozone) {
     sources += [
@@ -293,3 +300,13 @@ action("generate_gl_bindings") {
     rebase_path(gl_binding_output_dir, root_build_dir),
   ]
 }
+
+if (is_android) {
+  generate_jni("gl_jni_headers") {
+    sources = [
+      "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
+      "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java",
+    ]
+    jni_package = "ui/gl"
+  }
+}