Move util BUILD.gn out of android/

Bug: 995916

Change-Id: I5fa12d55d08f69243a83fd685cc9c3aa44a3add5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1873906
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709247}

chrome/android/BUILD.gn

@@ -285,7 +285,7 @@ android_library("chrome_java") {
     "//chrome/browser/share/android:java_resources",
     "//chrome/browser/ui/android/styles:java",
     "//chrome/browser/ui/android/widget:java",
-    "//chrome/browser/util/android:java",
+    "//chrome/browser/util:java",
     "//chrome/lib/lifecycle/public/android:java",
     "//components/autofill/android:autofill_java",
     "//components/autofill_assistant/browser:proto_java",
@@ -535,7 +535,7 @@ group("jni_headers") {
     "//chrome/android/public/profiles:jni_headers",
     "//chrome/browser/image_fetcher:jni_headers",
     "//chrome/browser/touch_to_fill/android:jni_headers",
-    "//chrome/browser/util/android:jni_headers",
+    "//chrome/browser/util:jni_headers",
   ]
 }
 
@@ -805,7 +805,7 @@ android_library("chrome_test_java") {
     "//chrome/browser/ui/android/styles:java",
     "//chrome/browser/ui/android/widget:java",
     "//chrome/browser/ui/android/widget:test_support_java",
-    "//chrome/browser/util/android:java",
+    "//chrome/browser/util:java",
     "//chrome/test/android:chrome_java_test_support",
     "//chrome/test/android/test_trusted_web_activity:test_trusted_web_activity_java",
     "//components/autofill/android:autofill_java",
@@ -961,7 +961,7 @@ if (enable_vr || enable_arcore) {
     "//chrome/android:app_hooks_java",
     "//chrome/android:chrome_java",
     "//chrome/android/features/vr:java",
-    "//chrome/browser/util/android:java",
+    "//chrome/browser/util:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/policy/android:policy_java",
     "//content/public/android:content_java",

chrome/android/features/autofill_assistant/BUILD.gn

@@ -36,7 +36,7 @@ android_library("java") {
     "//chrome/android/public/profiles:java",
     "//chrome/browser/image_fetcher:java",
     "//chrome/browser/ui/android/widget:java",
-    "//chrome/browser/util/android:java",
+    "//chrome/browser/util:java",
     "//components/policy/android:policy_java",
     "//components/signin/core/browser/android:java",
     "//components/url_formatter/android:url_formatter_java",

chrome/android/features/keyboard_accessory/internal/BUILD.gn

@@ -17,7 +17,7 @@ android_library("internal_java") {
     "//chrome/android/features/keyboard_accessory/public:public_java",
     "//chrome/android/public/profiles:java",
     "//chrome/browser/ui/android/widget:java",
-    "//chrome/browser/util/android:java",
+    "//chrome/browser/util:java",
     "//components/autofill/android:autofill_java",
     "//components/feature_engagement/public:public_java",
     "//content/public/android:content_java",

chrome/android/features/tab_ui/BUILD.gn

@@ -162,7 +162,7 @@ android_library("java") {
     "//chrome/app:java_strings_grd",
     "//chrome/browser/ui/android/styles:java",
     "//chrome/browser/ui/android/widget:java",
-    "//chrome/browser/util/android:java",
+    "//chrome/browser/util:java",
     "//chrome/lib/lifecycle/public/android:java",
     "//components/embedder_support/android:web_contents_delegate_java",
     "//components/feature_engagement:feature_engagement_java",

chrome/android/features/vr/BUILD.gn

@@ -119,7 +119,7 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//chrome/android:chrome_java",
-    "//chrome/browser/util/android:java",
+    "//chrome/browser/util:java",
     "//components/policy/android:policy_java",
     "//content/public/android:content_java",
     "//device/vr:java",

chrome/browser/android/chrome_context_util.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/android/chrome_context_util.h"
 
 #include "base/android/jni_android.h"
-#include "chrome/browser/util/android/jni_headers/ChromeContextUtil_jni.h"
+#include "chrome/browser/util/jni_headers/ChromeContextUtil_jni.h"
 
 namespace chrome {
 namespace android {

chrome/browser/android/util/url_utilities.cc

@@ -7,7 +7,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/util/android/jni_headers/UrlUtilities_jni.h"
+#include "chrome/browser/util/jni_headers/UrlUtilities_jni.h"
 #include "components/google/core/common/google_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/gurl.h"

chrome/browser/image_fetcher/BUILD.gn

@@ -9,7 +9,7 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//chrome/android/public/profiles:java",
-    "//chrome/browser/util/android:java",
+    "//chrome/browser/util:java",
     "//content/public/android:content_java",
     "//third_party/gif_player:gif_player_java",
   ]

chrome/browser/platform_util_android.cc

@@ -8,7 +8,7 @@
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "chrome/browser/platform_util.h"
-#include "chrome/browser/util/android/jni_headers/PlatformUtil_jni.h"
+#include "chrome/browser/util/jni_headers/PlatformUtil_jni.h"
 #include "ui/android/view_android.h"
 #include "url/gurl.h"
 

chrome/browser/touch_to_fill/android/internal/BUILD.gn

@@ -12,7 +12,7 @@ android_library("java") {
     "//base:jni_java",
     "//chrome/android:chrome_java",
     "//chrome/browser/touch_to_fill/android:public_java",
-    "//chrome/browser/util/android:java",
+    "//chrome/browser/util:java",
     "//components/url_formatter/android:url_formatter_java",
     "//third_party/android_deps:com_android_support_recyclerview_v7_java",
     "//ui/android:ui_java",

chrome/browser/ui/android/widget/BUILD.gn

@@ -55,7 +55,7 @@ android_library("java") {
   deps = [
     ":ui_widget_java_resources",
     "//base:base_java",
-    "//chrome/browser/util/android:java",
+    "//chrome/browser/util:java",
     "//third_party/android_deps:android_support_v4_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:com_android_support_design_java",

chrome/browser/util/BUILD.gn

+# Copyright 2019 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/android/rules.gni")
+
+android_library("java") {
+  java_files = [
+    "android/java/src/org/chromium/chrome/browser/util/AccessibilityUtil.java",
+    "android/java/src/org/chromium/chrome/browser/util/AndroidTaskUtils.java",
+    "android/java/src/org/chromium/chrome/browser/util/BitmapCache.java",
+    "android/java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java",
+    "android/java/src/org/chromium/chrome/browser/util/ChromeFileProvider.java",
+    "android/java/src/org/chromium/chrome/browser/util/ColorUtils.java",
+    "android/java/src/org/chromium/chrome/browser/util/ConversionUtils.java",
+    "android/java/src/org/chromium/chrome/browser/util/FileSizeUtil.java",
+    "android/java/src/org/chromium/chrome/browser/util/HashUtil.java",
+    "android/java/src/org/chromium/chrome/browser/util/IntentUtils.java",
+    "android/java/src/org/chromium/chrome/browser/util/KeyNavigationUtil.java",
+    "android/java/src/org/chromium/chrome/browser/util/MathUtils.java",
+    "android/java/src/org/chromium/chrome/browser/util/PlatformUtil.java",
+    "android/java/src/org/chromium/chrome/browser/util/UrlConstants.java",
+    "android/java/src/org/chromium/chrome/browser/util/UrlUtilities.java",
+    "android/java/src/org/chromium/chrome/browser/util/ViewUtils.java",
+  ]
+  deps = [
+    "//base:base_java",
+    "//base:jni_java",
+    "//content/public/android:content_java",
+    "//third_party/android_deps:com_android_support_collections_java",
+    "//third_party/android_deps:com_android_support_support_compat_java",
+    "//third_party/android_deps:com_android_support_support_core_utils_java",
+  ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+}
+
+generate_jni("jni_headers") {
+  sources = [
+    "android/java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java",
+    "android/java/src/org/chromium/chrome/browser/util/PlatformUtil.java",
+    "android/java/src/org/chromium/chrome/browser/util/UrlUtilities.java",
+  ]
+}

chrome/browser/util/android/BUILD.gn

@@ -4,40 +4,8 @@
 
 import("//build/config/android/rules.gni")
 
-android_library("java") {
-  java_files = [
-    "java/src/org/chromium/chrome/browser/util/AccessibilityUtil.java",
-    "java/src/org/chromium/chrome/browser/util/AndroidTaskUtils.java",
-    "java/src/org/chromium/chrome/browser/util/BitmapCache.java",
-    "java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java",
-    "java/src/org/chromium/chrome/browser/util/ChromeFileProvider.java",
-    "java/src/org/chromium/chrome/browser/util/ColorUtils.java",
-    "java/src/org/chromium/chrome/browser/util/ConversionUtils.java",
-    "java/src/org/chromium/chrome/browser/util/FileSizeUtil.java",
-    "java/src/org/chromium/chrome/browser/util/HashUtil.java",
-    "java/src/org/chromium/chrome/browser/util/IntentUtils.java",
-    "java/src/org/chromium/chrome/browser/util/KeyNavigationUtil.java",
-    "java/src/org/chromium/chrome/browser/util/MathUtils.java",
-    "java/src/org/chromium/chrome/browser/util/PlatformUtil.java",
-    "java/src/org/chromium/chrome/browser/util/UrlConstants.java",
-    "java/src/org/chromium/chrome/browser/util/UrlUtilities.java",
-    "java/src/org/chromium/chrome/browser/util/ViewUtils.java",
-  ]
+java_group("java") {
   deps = [
-    "//base:base_java",
-    "//base:jni_java",
-    "//content/public/android:content_java",
-    "//third_party/android_deps:com_android_support_collections_java",
-    "//third_party/android_deps:com_android_support_support_compat_java",
-    "//third_party/android_deps:com_android_support_support_core_utils_java",
-  ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-}
-
-generate_jni("jni_headers") {
-  sources = [
-    "java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java",
-    "java/src/org/chromium/chrome/browser/util/PlatformUtil.java",
-    "java/src/org/chromium/chrome/browser/util/UrlUtilities.java",
+    "//chrome/browser/util:java",
   ]
 }

chrome/test/android/BUILD.gn

@@ -181,7 +181,7 @@ android_library("chrome_java_test_support") {
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/android/third_party/compositor_animator:compositor_animator_java",
-    "//chrome/browser/util/android:java",
+    "//chrome/browser/util:java",
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/embedder_support/android:web_contents_delegate_java",
     "//components/invalidation/impl:java",