| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 { | 4 { |
| 5 'includes': ['src/cpp/libaddressinput.gypi'], | 5 'includes': ['src/cpp/libaddressinput.gypi'], |
| 6 'variables': { | 6 'variables': { |
| 7 'libaddressinput_test_data_dir%': 'src/third_party/libaddressinput/src/testd
ata', | 7 'libaddressinput_test_data_dir%': 'src/third_party/libaddressinput/src/testd
ata', |
| 8 'libaddressinput_util_files': [ | 8 'libaddressinput_util_files': [ |
| 9 'src/cpp/src/address_data.cc', | 9 'src/cpp/src/address_data.cc', |
| 10 'src/cpp/src/address_field.cc', | 10 'src/cpp/src/address_field.cc', |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 'target_name': 'libaddressinput_util', | 54 'target_name': 'libaddressinput_util', |
| 55 'type': 'static_library', | 55 'type': 'static_library', |
| 56 'sources': [ | 56 'sources': [ |
| 57 '<@(libaddressinput_util_files)', | 57 '<@(libaddressinput_util_files)', |
| 58 'chromium/addressinput_util.cc', | 58 'chromium/addressinput_util.cc', |
| 59 'chromium/json.cc', | 59 'chromium/json.cc', |
| 60 ], | 60 ], |
| 61 'sources!': [ | 61 'sources!': [ |
| 62 'src/cpp/src/util/json.cc', | 62 'src/cpp/src/util/json.cc', |
| 63 ], | 63 ], |
| 64 'conditions': [ | |
| 65 ['OS=="mac" or OS=="ios"', { | |
| 66 # localization.cc in libaddressinput_util_files includes | |
| 67 # grit-generated en_messages.cc, which does not have a newline. | |
| 68 'xcode_settings': { | |
| 69 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'NO', | |
| 70 }, | |
| 71 }], | |
| 72 ], | |
| 73 'include_dirs': [ | 64 'include_dirs': [ |
| 74 'chromium/override/', | 65 'chromium/override/', |
| 75 'src/cpp/include/', | 66 'src/cpp/include/', |
| 76 ], | 67 ], |
| 77 'defines': [ | 68 'defines': [ |
| 78 'I18N_ADDRESSINPUT_USE_BASICTYPES_OVERRIDE=1', | 69 'I18N_ADDRESSINPUT_USE_BASICTYPES_OVERRIDE=1', |
| 79 ], | 70 ], |
| 80 'direct_dependent_settings': { | 71 'direct_dependent_settings': { |
| 81 'include_dirs': [ | 72 'include_dirs': [ |
| 82 'chromium/override/', | 73 'chromium/override/', |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 '../../base/base.gyp:base_prefs', | 146 '../../base/base.gyp:base_prefs', |
| 156 '../../base/base.gyp:run_all_unittests', | 147 '../../base/base.gyp:run_all_unittests', |
| 157 '../../net/net.gyp:net_test_support', | 148 '../../net/net.gyp:net_test_support', |
| 158 '../../testing/gtest.gyp:gtest', | 149 '../../testing/gtest.gyp:gtest', |
| 159 'libaddressinput', | 150 'libaddressinput', |
| 160 'libaddressinput_util', | 151 'libaddressinput_util', |
| 161 ], | 152 ], |
| 162 }, | 153 }, |
| 163 ], | 154 ], |
| 164 } | 155 } |
| OLD | NEW |