| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 { | 5 { | 
| 6   'target_defaults': { | 6   'target_defaults': { | 
| 7     'include_dirs': [ | 7     'include_dirs': [ | 
| 8       'src', | 8       'src', | 
| 9       'src/test', | 9       'src/test', | 
| 10       # The libphonenumber source (and test code) expects the | 10       # The libphonenumber source (and test code) expects the | 
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 59       'src/phonenumbers/unicodestring.cc', | 59       'src/phonenumbers/unicodestring.cc', | 
| 60       'src/phonenumbers/utf/rune.c', | 60       'src/phonenumbers/utf/rune.c', | 
| 61       'src/phonenumbers/utf/unicodetext.cc', | 61       'src/phonenumbers/utf/unicodetext.cc', | 
| 62       'src/phonenumbers/utf/unilib.cc', | 62       'src/phonenumbers/utf/unilib.cc', | 
| 63       'src/resources/phonemetadata.proto', | 63       'src/resources/phonemetadata.proto', | 
| 64       'src/resources/phonenumber.proto', | 64       'src/resources/phonenumber.proto', | 
| 65     ], | 65     ], | 
| 66     'variables': { | 66     'variables': { | 
| 67       'proto_in_dir': 'src/resources', | 67       'proto_in_dir': 'src/resources', | 
| 68       'proto_out_dir': 'third_party/libphonenumber/phonenumbers', | 68       'proto_out_dir': 'third_party/libphonenumber/phonenumbers', | 
|  | 69       'clang_warning_flags': [ | 
|  | 70         # https://github.com/googlei18n/libphonenumber/pull/741 | 
|  | 71         '-Wno-unused-private-field', | 
|  | 72       ], | 
| 69     }, | 73     }, | 
| 70     'includes': [ '../../build/protoc.gypi' ], | 74     'includes': [ '../../build/protoc.gypi' ], | 
| 71     'direct_dependent_settings': { | 75     'direct_dependent_settings': { | 
| 72       'include_dirs': [ | 76       'include_dirs': [ | 
| 73         '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber', | 77         '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber', | 
| 74         'src', | 78         'src', | 
| 75       ], | 79       ], | 
| 76       'defines': [ | 80       'defines': [ | 
| 77         'I18N_PHONENUMBERS_USE_ICU_REGEXP=1', | 81         'I18N_PHONENUMBERS_USE_ICU_REGEXP=1', | 
| 78       ], | 82       ], | 
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 142       }], | 146       }], | 
| 143       # libphonenumber needs to fix their ODR violations. http://crbug.com/45602
     1 | 147       # libphonenumber needs to fix their ODR violations. http://crbug.com/45602
     1 | 
| 144       ['OS=="linux"', { | 148       ['OS=="linux"', { | 
| 145         'ldflags!': [ | 149         'ldflags!': [ | 
| 146           '-Wl,--detect-odr-violations', | 150           '-Wl,--detect-odr-violations', | 
| 147         ], | 151         ], | 
| 148       }], | 152       }], | 
| 149     ], | 153     ], | 
| 150   }] | 154   }] | 
| 151 } | 155 } | 
| OLD | NEW | 
|---|