Enable more targets in the Android GN build.

This enables some already-working targets and adds a missing cpufeatures dep to crypto to make it compile. I added a comment in the cpufeatures build file so I can find it more easily by grepping next time.

R=cjhopman@chromium.org

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

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

BUILD.gn

@@ -52,7 +52,7 @@ group("root") {
     "//third_party/libwebm",
     "//third_party/libwebp",
     "//third_party/ots",
-      "//third_party/protobuf:protobuf_lite",
+    "//third_party/protobuf:protobuf_lite",
     "//third_party/qcms",
     "//third_party/re2",
     "//third_party/smhasher:cityhash",
@@ -84,24 +84,18 @@ group("root") {
 
   if (is_android) {
     deps -= [
-      "//components/os_crypt",
       "//content/public/common",
-      "//crypto",
-      "//gpu/command_buffer/client",  # Needs Skia.
+      "//gpu/command_buffer/client",  # Needs some JNI stuff:
       "//gpu/command_buffer/service",
       "//net",
       "//third_party/libusb",
-      # Should work, but staging this landing for Android separately.
-      "//third_party/protobuf:protobuf_lite",
       #"//third_party/WebKit/Source/platform",
       "//third_party/WebKit/Source/wtf",  # TODO(brettw) re-enable for Android.
       "//tools/gn",
 
-      # This UI stuff is blocked on Skia.
-      "//ui/accessibility",
+      # ui_base doesn't work yet, and neither do things that depend on it.
       "//ui/base:ui_base",
       "//ui/events",
-      "//ui/gfx",
       "//ui/surface",
     ]
   }

crypto/BUILD.gn

@@ -118,6 +118,10 @@ component("crypto") {
     ]
   }
 
+  if (is_android) {
+    deps += [ "//third_party/android_tools:cpu_features" ]
+  }
+
   if (use_openssl) {
     # Remove NSS files when using OpenSSL
     sources -= [

tools/gn/secondary/third_party/android_tools/BUILD.gn

@@ -6,6 +6,8 @@ config("cpu_features_include") {
   include_dirs = [ "ndk/sources/android/cpufeatures" ]
 }
 
+# This is the GN version of
+# //build/android/cpufeatures.gypi:cpufeatures
 source_set("cpu_features") {
   sources = [ "ndk/sources/android/cpufeatures/cpu-features.c" ]
   direct_dependent_configs = [ ":cpu_features_include" ]