diff options
Diffstat (limited to 'chromium/third_party/libaddressinput/libaddressinput.gyp')
-rw-r--r-- | chromium/third_party/libaddressinput/libaddressinput.gyp | 154 |
1 files changed, 117 insertions, 37 deletions
diff --git a/chromium/third_party/libaddressinput/libaddressinput.gyp b/chromium/third_party/libaddressinput/libaddressinput.gyp index a668d0878a9..fc3fb930811 100644 --- a/chromium/third_party/libaddressinput/libaddressinput.gyp +++ b/chromium/third_party/libaddressinput/libaddressinput.gyp @@ -14,19 +14,23 @@ }, }], ], + 'defines': [ + 'CUSTOM_BASICTYPES="base/basictypes.h"', + 'CUSTOM_SCOPED_PTR="base/memory/scoped_ptr.h"', + ], }, 'targets': [ { - 'target_name': 'generated_messages', + 'target_name': 'libaddressinput_strings', 'type': 'none', 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/libaddressinput/', + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libaddressinput/', }, 'actions': [ { - 'action_name': 'generate_messages', + 'action_name': 'libaddressinput_strings', 'variables': { - 'grit_grd_file': '<(libaddressinput_dir)/cpp/res/messages.grd', + 'grit_grd_file': '<(libaddressinput_dir)/cpp/res/libaddressinput_strings.grd', }, 'includes': [ '../../build/grit_action.gypi', @@ -38,61 +42,127 @@ ], }, { - 'target_name': 'libaddressinput', + 'target_name': 'libaddressinput_updated_strings', + 'type': 'none', + 'variables': { + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/grit/libaddressinput/', + }, + 'actions': [ + { + 'action_name': 'libaddressinput_updated_strings', + 'variables': { + 'grit_grd_file': '../../chrome/app/address_input_strings.grd', + }, + 'includes': [ + '../../build/grit_action.gypi', + ], + }, + ], + 'includes': [ + '../../build/grit_target.gypi', + ], + }, + # This target provides basic functionality which is cooked into the build. + { 'target_name': 'libaddressinput_util', 'type': 'static_library', 'include_dirs': [ '<(libaddressinput_dir)/cpp/include/', '<(SHARED_INTERMEDIATE_DIR)/libaddressinput/', ], 'sources': [ + 'chromium/canonicalize_string.cc', 'chromium/json.cc', '<(libaddressinput_dir)/cpp/include/libaddressinput/address_data.h', '<(libaddressinput_dir)/cpp/include/libaddressinput/address_field.h', + '<(libaddressinput_dir)/cpp/include/libaddressinput/util/basictypes.h', + '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/basictypes.h', + '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/move.h', + '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/scoped_ptr.h', + '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/template_util.h', + '<(libaddressinput_dir)/cpp/include/libaddressinput/util/scoped_ptr.h', + '<(libaddressinput_dir)/cpp/src/address_data.cc', + '<(libaddressinput_dir)/cpp/src/address_field.cc', + '<(libaddressinput_dir)/cpp/src/region_data_constants.cc', + '<(libaddressinput_dir)/cpp/src/region_data_constants.h', + '<(libaddressinput_dir)/cpp/src/rule.cc', + '<(libaddressinput_dir)/cpp/src/rule.h', + '<(libaddressinput_dir)/cpp/src/util/canonicalize_string.h', + '<(libaddressinput_dir)/cpp/src/util/json.h', + '<(libaddressinput_dir)/cpp/src/util/stl_util.h', + '<(libaddressinput_dir)/cpp/src/util/string_util.cc', + '<(libaddressinput_dir)/cpp/src/util/string_util.h', + ], + 'dependencies': [ + '<(DEPTH)/base/base.gyp:base', + '<(DEPTH)/base/base.gyp:base_i18n', + '<(DEPTH)/third_party/icu/icu.gyp:icui18n', + '<(DEPTH)/third_party/icu/icu.gyp:icuuc', + '<(DEPTH)/third_party/re2/re2.gyp:re2', + ], + 'direct_dependent_settings': { + 'defines': [ + 'CUSTOM_BASICTYPES="base/basictypes.h"', + 'CUSTOM_SCOPED_PTR="base/memory/scoped_ptr.h"', + ], + 'include_dirs': [ + '<(libaddressinput_dir)/cpp/include/', + ], + }, + }, + # This target provides more complicated functionality like pinging servers + # for validation rules. + { + 'target_name': 'libaddressinput', + 'type': 'static_library', + 'include_dirs': [ + '<(libaddressinput_dir)/cpp/include/', + '<(SHARED_INTERMEDIATE_DIR)/libaddressinput/', + ], + 'sources': [ + 'chromium/chrome_downloader_impl.cc', + 'chromium/chrome_downloader_impl.h', + 'chromium/chrome_storage_impl.cc', + 'chromium/chrome_storage_impl.h', '<(libaddressinput_dir)/cpp/include/libaddressinput/address_problem.h', '<(libaddressinput_dir)/cpp/include/libaddressinput/address_ui_component.h', '<(libaddressinput_dir)/cpp/include/libaddressinput/address_ui.h', '<(libaddressinput_dir)/cpp/include/libaddressinput/address_validator.h', '<(libaddressinput_dir)/cpp/include/libaddressinput/load_rules_delegate.h', - '<(libaddressinput_dir)/cpp/include/libaddressinput/localization.h', - '<(libaddressinput_dir)/cpp/include/libaddressinput/util/basictypes.h', - '<(libaddressinput_dir)/cpp/include/libaddressinput/util/scoped_ptr.h', - '<(libaddressinput_dir)/cpp/include/libaddressinput/util/template_util.h', - '<(libaddressinput_dir)/cpp/src/address_field.cc', - '<(libaddressinput_dir)/cpp/src/address_field_util.cc', - '<(libaddressinput_dir)/cpp/src/address_field_util.h', '<(libaddressinput_dir)/cpp/src/address_problem.cc', '<(libaddressinput_dir)/cpp/src/address_ui.cc', '<(libaddressinput_dir)/cpp/src/address_validator.cc', + '<(libaddressinput_dir)/cpp/src/country_rules_aggregator.cc', + '<(libaddressinput_dir)/cpp/src/country_rules_aggregator.h', + '<(libaddressinput_dir)/cpp/src/fallback_data_store.cc', + '<(libaddressinput_dir)/cpp/src/fallback_data_store.h', '<(libaddressinput_dir)/cpp/src/grit.h', - '<(libaddressinput_dir)/cpp/src/localization.cc', - '<(libaddressinput_dir)/cpp/src/lookup_key_util.cc', - '<(libaddressinput_dir)/cpp/src/lookup_key_util.h', - '<(libaddressinput_dir)/cpp/src/region_data_constants.cc', - '<(libaddressinput_dir)/cpp/src/region_data_constants.h', '<(libaddressinput_dir)/cpp/src/retriever.cc', '<(libaddressinput_dir)/cpp/src/retriever.h', - '<(libaddressinput_dir)/cpp/src/rule.cc', - '<(libaddressinput_dir)/cpp/src/rule.h', - '<(libaddressinput_dir)/cpp/src/rule_retriever.cc', - '<(libaddressinput_dir)/cpp/src/rule_retriever.h', - '<(libaddressinput_dir)/cpp/src/util/json.h', + '<(libaddressinput_dir)/cpp/src/ruleset.cc', + '<(libaddressinput_dir)/cpp/src/ruleset.h', '<(libaddressinput_dir)/cpp/src/util/md5.cc', '<(libaddressinput_dir)/cpp/src/util/md5.h', - '<(libaddressinput_dir)/cpp/src/util/string_split.cc', - '<(libaddressinput_dir)/cpp/src/util/string_split.h', - '<(libaddressinput_dir)/cpp/src/validating_storage.cc', - '<(libaddressinput_dir)/cpp/src/validating_storage.h', - '<(libaddressinput_dir)/cpp/src/validating_util.cc', - '<(libaddressinput_dir)/cpp/src/validating_util.h', + '<(libaddressinput_dir)/cpp/src/util/trie.cc', + '<(libaddressinput_dir)/cpp/src/util/trie.h', ], 'defines': [ - 'VALIDATION_DATA_URL="https://i18napis.appspot.com/ssl-address/"', + 'VALIDATION_DATA_URL="https://i18napis.appspot.com/ssl-aggregate-address/"', ], 'dependencies': [ - 'generated_messages', + 'libaddressinput_strings', + 'libaddressinput_updated_strings', + 'libaddressinput_util', '<(DEPTH)/base/base.gyp:base', + '<(DEPTH)/base/base.gyp:base_i18n', + '<(DEPTH)/third_party/icu/icu.gyp:icui18n', + '<(DEPTH)/third_party/icu/icu.gyp:icuuc', + '<(DEPTH)/third_party/re2/re2.gyp:re2', ], 'direct_dependent_settings': { + 'defines': [ + 'CUSTOM_BASICTYPES="base/basictypes.h"', + 'CUSTOM_SCOPED_PTR="base/memory/scoped_ptr.h"', + ], 'include_dirs': [ '<(libaddressinput_dir)/cpp/include/', ], @@ -102,38 +172,48 @@ 'target_name': 'libaddressinput_unittests', 'type': '<(gtest_target_type)', 'include_dirs': [ + '<(DEPTH)', '<(libaddressinput_dir)/cpp/src/', '<(DEPTH)/testing/gtest/include/', '<(SHARED_INTERMEDIATE_DIR)/libaddressinput/', ], 'sources': [ - '<(libaddressinput_dir)/cpp/test/address_field_util_test.cc', + 'chromium/chrome_downloader_impl_unittest.cc', + 'chromium/chrome_rule_test.cc', + 'chromium/chrome_storage_impl_unittest.cc', + '<(libaddressinput_dir)/cpp/test/address_data_test.cc', '<(libaddressinput_dir)/cpp/test/address_ui_test.cc', + '<(libaddressinput_dir)/cpp/test/address_validator_test.cc', + '<(libaddressinput_dir)/cpp/test/country_rules_aggregator_test.cc', + '<(libaddressinput_dir)/cpp/test/countryinfo_example_addresses_test.cc', '<(libaddressinput_dir)/cpp/test/fake_downloader.cc', '<(libaddressinput_dir)/cpp/test/fake_downloader.h', '<(libaddressinput_dir)/cpp/test/fake_downloader_test.cc', '<(libaddressinput_dir)/cpp/test/fake_storage.cc', '<(libaddressinput_dir)/cpp/test/fake_storage.h', '<(libaddressinput_dir)/cpp/test/fake_storage_test.cc', - '<(libaddressinput_dir)/cpp/test/localization_test.cc', - '<(libaddressinput_dir)/cpp/test/lookup_key_util_test.cc', + '<(libaddressinput_dir)/cpp/test/fallback_data_store_test.cc', '<(libaddressinput_dir)/cpp/test/region_data_constants_test.cc', '<(libaddressinput_dir)/cpp/test/retriever_test.cc', - '<(libaddressinput_dir)/cpp/test/rule_retriever_test.cc', '<(libaddressinput_dir)/cpp/test/rule_test.cc', + '<(libaddressinput_dir)/cpp/test/storage_test_runner.cc', + '<(libaddressinput_dir)/cpp/test/storage_test_runner.h', '<(libaddressinput_dir)/cpp/test/util/json_test.cc', '<(libaddressinput_dir)/cpp/test/util/md5_unittest.cc', '<(libaddressinput_dir)/cpp/test/util/scoped_ptr_unittest.cc', - '<(libaddressinput_dir)/cpp/test/util/string_split_unittest.cc', - '<(libaddressinput_dir)/cpp/test/validating_storage_test.cc', - '<(libaddressinput_dir)/cpp/test/validating_util_test.cc', + '<(libaddressinput_dir)/cpp/test/util/stl_util_unittest.cc', + '<(libaddressinput_dir)/cpp/test/util/string_util_test.cc', + '<(libaddressinput_dir)/cpp/test/util/trie_test.cc', ], 'defines': [ 'TEST_DATA_DIR="third_party/libaddressinput/src/testdata"', ], 'dependencies': [ 'libaddressinput', + 'libaddressinput_strings', + '<(DEPTH)/base/base.gyp:base_prefs', '<(DEPTH)/base/base.gyp:run_all_unittests', + '<(DEPTH)/net/net.gyp:net_test_support', '<(DEPTH)/testing/gtest.gyp:gtest', ], }, |