Revert of [android] Remove libaddressinput Java widget.

third_party/libaddressinput/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("//testing/test.gni")
 import("//tools/grit/grit_rule.gni")
 
 libaddressinput_util_files = [
   "src/cpp/src/address_data.cc",
   "src/cpp/src/address_field.cc",
@@ skipping 106 matching lines @@
 
   deps = [
     ":strings",
     "//base",
     "//base:i18n",
     "//third_party/icu",
     "//third_party/re2",
   ]
 }
 
-# The list of files in libaddressinput.gypi.
-gypi_values = exec_script("//build/gypi_to_gn.py",
-                          [ rebase_path("src/cpp/libaddressinput.gypi") ],
-                          "scope",
-                          [ "src/cpp/libaddressinput.gypi" ])
+if (is_android) {
+  import("//build/config/android/rules.gni")
 
-# This target provides more complicated functionality like pinging servers
-# for validation rules.
-# GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput
-static_library("libaddressinput") {
-  sources = rebase_path(gypi_values.libaddressinput_files, ".", "src/cpp")
-  sources += [
-    "chromium/chrome_address_validator.cc",
-    "chromium/chrome_metadata_source.cc",
-    "chromium/chrome_storage_impl.cc",
-    "chromium/fallback_data_store.cc",
-    "chromium/input_suggester.cc",
-    "chromium/string_compare.cc",
-    "chromium/trie.cc",
-  ]
-  sources -= libaddressinput_util_files
-  sources -= [ "src/cpp/src/util/string_compare.cc" ]
+  # GYP: //third_party/libaddressinput/libaddressinput.gyp:libaddressinput_android_strings_grd
+  java_strings_grd("libaddressinput_android_strings_grd") {
+    grd_file = "//chrome/app/address_input_strings_android.grd"
+    outputs = [
+      "values-am/address_input_strings.xml",
+      "values-ar/address_input_strings.xml",
+      "values-bg/address_input_strings.xml",
+      "values-ca/address_input_strings.xml",
+      "values-cs/address_input_strings.xml",
+      "values-da/address_input_strings.xml",
+      "values-de/address_input_strings.xml",
+      "values-el/address_input_strings.xml",
+      "values-en-rGB/address_input_strings.xml",
+      "values-es-rUS/address_input_strings.xml",
+      "values-es/address_input_strings.xml",
+      "values-fa/address_input_strings.xml",
+      "values-fi/address_input_strings.xml",
+      "values-fr/address_input_strings.xml",
+      "values-hi/address_input_strings.xml",
+      "values-hr/address_input_strings.xml",
+      "values-hu/address_input_strings.xml",
+      "values-in/address_input_strings.xml",
+      "values-it/address_input_strings.xml",
+      "values-iw/address_input_strings.xml",
+      "values-ja/address_input_strings.xml",
+      "values-ko/address_input_strings.xml",
+      "values-lt/address_input_strings.xml",
+      "values-lv/address_input_strings.xml",
+      "values-nb/address_input_strings.xml",
+      "values-nl/address_input_strings.xml",
+      "values-pl/address_input_strings.xml",
+      "values-pt-rBR/address_input_strings.xml",
+      "values-pt-rPT/address_input_strings.xml",
+      "values-ro/address_input_strings.xml",
+      "values-ru/address_input_strings.xml",
+      "values-sk/address_input_strings.xml",
+      "values-sl/address_input_strings.xml",
+      "values-sr/address_input_strings.xml",
+      "values-sv/address_input_strings.xml",
+      "values-sw/address_input_strings.xml",
+      "values-th/address_input_strings.xml",
+      "values-tl/address_input_strings.xml",
+      "values-tr/address_input_strings.xml",
+      "values-uk/address_input_strings.xml",
+      "values-vi/address_input_strings.xml",
+      "values-zh-rCN/address_input_strings.xml",
+      "values-zh-rTW/address_input_strings.xml",
+      "values/address_input_strings.xml",
+    ]
+  }
 
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
+  android_resources("android_addressinput_widget_resources") {
+    deps = [
+      ":libaddressinput_android_strings_grd",
+    ]
+    custom_package = "com.android.i18n.addressinput"
+    resource_dirs = [ "src/java/res" ]
+    v14_verify_only = true
+  }
 
-  public_configs = [ ":libaddressinput_config" ]
+  # GYP: //third_party/libaddressinput/libaddressinput.gyp:android_addressinput_widget
+  android_library("android_addressinput_widget_java") {
+    DEPRECATED_java_in_dir = "src/java/src"
+    deps = [
+      ":android_addressinput_widget_resources",
+    ]
+  }
+} else {
+  # The list of files in libaddressinput.gypi.
+  gypi_values = exec_script("//build/gypi_to_gn.py",
+                            [ rebase_path("src/cpp/libaddressinput.gypi") ],
+                            "scope",
+                            [ "src/cpp/libaddressinput.gypi" ])
 
-  deps = [
-    ":strings",
-    ":util",
-    "//base",
-    "//base:i18n",
-    "//third_party/icu",
-    "//third_party/re2",
-  ]
+  # This target provides more complicated functionality like pinging servers
+  # for validation rules.
+  # GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput
+  static_library("libaddressinput") {
+    sources = rebase_path(gypi_values.libaddressinput_files, ".", "src/cpp")
+    sources += [
+      "chromium/chrome_address_validator.cc",
+      "chromium/chrome_metadata_source.cc",
+      "chromium/chrome_storage_impl.cc",
+      "chromium/fallback_data_store.cc",
+      "chromium/input_suggester.cc",
+      "chromium/string_compare.cc",
+      "chromium/trie.cc",
+    ]
+    sources -= libaddressinput_util_files
+    sources -= [ "src/cpp/src/util/string_compare.cc" ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+
+    public_configs = [ ":libaddressinput_config" ]
+
+    deps = [
+      ":strings",
+      ":util",
+      "//base",
+      "//base:i18n",
+      "//third_party/icu",
+      "//third_party/re2",
+    ]
+  }
+
+  test("libaddressinput_unittests") {
+    sources =
+        rebase_path(gypi_values.libaddressinput_test_files, ".", "src/cpp")
+    sources += [
+      "chromium/addressinput_util_unittest.cc",
+      "chromium/chrome_address_validator_unittest.cc",
+      "chromium/chrome_metadata_source_unittest.cc",
+      "chromium/chrome_storage_impl_unittest.cc",
+      "chromium/fallback_data_store_unittest.cc",
+      "chromium/storage_test_runner.cc",
+      "chromium/string_compare_unittest.cc",
+      "chromium/trie_unittest.cc",
+    ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+
+    defines = [ "TEST_DATA_DIR=\"third_party/libaddressinput/src/testdata\"" ]
+
+    include_dirs = [ "src/cpp/src" ]
+
+    deps = [
+      ":libaddressinput",
+      ":strings",
+      "//base:prefs",
+      "//base/test:run_all_unittests",
+      "//net:test_support",
+      "//testing/gtest",
+    ]
+  }
 }
-
-test("libaddressinput_unittests") {
-  sources = rebase_path(gypi_values.libaddressinput_test_files, ".", "src/cpp")
-  sources += [
-    "chromium/addressinput_util_unittest.cc",
-    "chromium/chrome_address_validator_unittest.cc",
-    "chromium/chrome_metadata_source_unittest.cc",
-    "chromium/chrome_storage_impl_unittest.cc",
-    "chromium/fallback_data_store_unittest.cc",
-    "chromium/storage_test_runner.cc",
-    "chromium/string_compare_unittest.cc",
-    "chromium/trie_unittest.cc",
-  ]
-
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
-
-  defines = [ "TEST_DATA_DIR=\"third_party/libaddressinput/src/testdata\"" ]
-
-  include_dirs = [ "src/cpp/src" ]
-
-  deps = [
-    ":libaddressinput",
-    ":strings",
-    "//base:prefs",
-    "//base/test:run_all_unittests",
-    "//net:test_support",
-    "//testing/gtest",
-  ]
-}