Remove gypi integration from libaddressinput and openh264

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 d8a0b01e6fbb19b26b78ca0b796c0726e01e1ea3..ad21974e4ddd83a16c8c8641b9e38e1a5851ec3b 100644
--- a/third_party/libaddressinput/BUILD.gn
+++ b/third_party/libaddressinput/BUILD.gn
@@ -6,32 +6,12 @@ import("//testing/test.gni")
 import("//build/config/locales.gni")
 import("//tools/grit/grit_rule.gni")
 
-libaddressinput_util_files = [
-  "src/cpp/src/address_data.cc",
-  "src/cpp/src/address_field.cc",
-  "src/cpp/src/address_field_util.cc",
-  "src/cpp/src/address_formatter.cc",
-  "src/cpp/src/address_metadata.cc",
-  "src/cpp/src/address_ui.cc",
-  "src/cpp/src/format_element.cc",
-  "src/cpp/src/language.cc",
-  "src/cpp/src/localization.cc",
-  "src/cpp/src/lookup_key.cc",
-  "src/cpp/src/region_data_constants.cc",
-  "src/cpp/src/rule.cc",
-  "src/cpp/src/util/cctype_tolower_equal.cc",
-  "src/cpp/src/util/json.cc",
-  "src/cpp/src/util/string_split.cc",
-  "src/cpp/src/util/string_util.cc",
-]
-
 config("no-newline-eof-warning") {
   if (is_clang) {
     cflags = [ "-Wno-newline-eof" ]
   }
 }
 
-# GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings
 grit("strings") {
   source = "//chrome/app/address_input_strings.grd"
   outputs = [
@@ -57,14 +37,26 @@ config("libaddressinput_config") {
 }
 
 # This target provides basic functionality which is cooked into the build.
-# GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util
 static_library("util") {
-  sources = libaddressinput_util_files
-  sources += [
+  sources = [
     "chromium/addressinput_util.cc",
     "chromium/json.cc",
+    "src/cpp/src/address_data.cc",
+    "src/cpp/src/address_field.cc",
+    "src/cpp/src/address_field_util.cc",
+    "src/cpp/src/address_formatter.cc",
+    "src/cpp/src/address_metadata.cc",
+    "src/cpp/src/address_ui.cc",
+    "src/cpp/src/format_element.cc",
+    "src/cpp/src/language.cc",
+    "src/cpp/src/localization.cc",
+    "src/cpp/src/lookup_key.cc",
+    "src/cpp/src/region_data_constants.cc",
+    "src/cpp/src/rule.cc",
+    "src/cpp/src/util/cctype_tolower_equal.cc",
+    "src/cpp/src/util/string_split.cc",
+    "src/cpp/src/util/string_util.cc",
   ]
-  sources -= [ "src/cpp/src/util/json.cc" ]
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
@@ -86,18 +78,10 @@ static_library("util") {
 }
 
 if (!is_android || use_aura) {
-  # 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 += [
+    sources = [
       "chromium/chrome_address_validator.cc",
       "chromium/chrome_metadata_source.cc",
       "chromium/chrome_storage_impl.cc",
@@ -105,9 +89,24 @@ if (!is_android || use_aura) {
       "chromium/input_suggester.cc",
       "chromium/string_compare.cc",
       "chromium/trie.cc",
+      "src/cpp/src/address_input_helper.cc",
+      "src/cpp/src/address_normalizer.cc",
+      "src/cpp/src/address_problem.cc",
+      "src/cpp/src/address_validator.cc",
+      "src/cpp/src/null_storage.cc",
+      "src/cpp/src/ondemand_supplier.cc",
+      "src/cpp/src/ondemand_supply_task.cc",
+      "src/cpp/src/post_box_matchers.cc",
+      "src/cpp/src/preload_supplier.cc",
+      "src/cpp/src/region_data.cc",
+      "src/cpp/src/region_data_builder.cc",
+      "src/cpp/src/retriever.cc",
+      "src/cpp/src/rule_retriever.cc",
+      "src/cpp/src/util/md5.cc",
+      "src/cpp/src/validating_storage.cc",
+      "src/cpp/src/validating_util.cc",
+      "src/cpp/src/validation_task.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" ]
@@ -127,9 +126,7 @@ if (!is_android || use_aura) {
   }
 
   test("libaddressinput_unittests") {
-    sources =
-        rebase_path(gypi_values.libaddressinput_test_files, ".", "src/cpp")
-    sources += [
+    sources = [
       "chromium/addressinput_util_unittest.cc",
       "chromium/chrome_address_validator_unittest.cc",
       "chromium/chrome_metadata_source_unittest.cc",
@@ -138,6 +135,45 @@ if (!is_android || use_aura) {
       "chromium/storage_test_runner.cc",
       "chromium/string_compare_unittest.cc",
       "chromium/trie_unittest.cc",
+      "src/cpp/test/address_data_test.cc",
+      "src/cpp/test/address_field_test.cc",
+      "src/cpp/test/address_field_util_test.cc",
+      "src/cpp/test/address_formatter_test.cc",
+      "src/cpp/test/address_input_helper_test.cc",
+      "src/cpp/test/address_metadata_test.cc",
+      "src/cpp/test/address_normalizer_test.cc",
+      "src/cpp/test/address_problem_test.cc",
+      "src/cpp/test/address_ui_test.cc",
+      "src/cpp/test/address_validator_test.cc",
+      "src/cpp/test/fake_storage.cc",
+      "src/cpp/test/fake_storage_test.cc",
+      "src/cpp/test/format_element_test.cc",
+      "src/cpp/test/language_test.cc",
+      "src/cpp/test/localization_test.cc",
+      "src/cpp/test/lookup_key_test.cc",
+      "src/cpp/test/mock_source.cc",
+      "src/cpp/test/null_storage_test.cc",
+      "src/cpp/test/ondemand_supply_task_test.cc",
+      "src/cpp/test/post_box_matchers_test.cc",
+      "src/cpp/test/preload_supplier_test.cc",
+      "src/cpp/test/region_data_builder_test.cc",
+      "src/cpp/test/region_data_constants_test.cc",
+      "src/cpp/test/region_data_test.cc",
+      "src/cpp/test/retriever_test.cc",
+      "src/cpp/test/rule_retriever_test.cc",
+      "src/cpp/test/rule_test.cc",
+      "src/cpp/test/supplier_test.cc",
+      "src/cpp/test/testdata_source.cc",
+      "src/cpp/test/testdata_source_test.cc",
+      "src/cpp/test/util/json_test.cc",
+      "src/cpp/test/util/md5_unittest.cc",
+      "src/cpp/test/util/scoped_ptr_unittest.cc",
+      "src/cpp/test/util/string_compare_test.cc",
+      "src/cpp/test/util/string_split_unittest.cc",
+      "src/cpp/test/util/string_util_test.cc",
+      "src/cpp/test/validating_storage_test.cc",
+      "src/cpp/test/validating_util_test.cc",
+      "src/cpp/test/validation_task_test.cc",
     ]
 
     if (is_ios) {