NOT FOR REVIEW: Aura on Android

third_party/libaddressinput/BUILD.gn

Index: third_party/libaddressinput/BUILD.gn
diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn
index 1307c7163699f581d7f275f0c205ab18df73e0ce..3d3ce8c79148d363dd03a124a25ac31d3f39d988 100644
--- a/third_party/libaddressinput/BUILD.gn
+++ b/third_party/libaddressinput/BUILD.gn
@@ -135,73 +135,71 @@ static_library("util") {
   ]
 }
 
-if (!is_android) {
-  # 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" ])
-
-  # 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",
-    ]
-  }
+# 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" ])
+
+# 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" ]
 
-  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",
-    ]
-  }
+  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",
+  ]
 }