| Index: base/base.gyp
|
| diff --git a/base/base.gyp b/base/base.gyp
|
| index a54701b81e23a5acf544a2d8c7af70c6b7336343..269bbe399f6af286c4915a8a1a0e5cc6255f2bd0 100644
|
| --- a/base/base.gyp
|
| +++ b/base/base.gyp
|
| @@ -639,6 +639,11 @@
|
| 'module_dir': 'base'
|
| },
|
| 'conditions': [
|
| + ['OS == "ios" or OS == "mac"', {
|
| + 'dependencies': [
|
| + 'base_unittests_arc',
|
| + ],
|
| + }],
|
| ['OS == "android"', {
|
| 'dependencies': [
|
| 'android/jni_generator/jni_generator.gyp:jni_generator_tests',
|
| @@ -1760,5 +1765,32 @@
|
| },
|
| ],
|
| }],
|
| + ['OS == "ios" or OS == "mac"', {
|
| + 'targets': [
|
| + {
|
| + 'target_name': 'base_unittests_arc',
|
| + 'type': 'static_library',
|
| + 'dependencies': [
|
| + 'base',
|
| + '../testing/gtest.gyp:gtest',
|
| + ],
|
| + 'sources': [
|
| + 'mac/bind_objc_block_unittest_arc.mm',
|
| + 'mac/scoped_nsobject_unittest_arc.mm'
|
| + ],
|
| + 'xcode_settings': {
|
| + 'CLANG_ENABLE_OBJC_ARC': 'YES',
|
| + },
|
| + 'target_conditions': [
|
| + ['OS == "ios" and _toolset != "host"', {
|
| + 'sources/': [
|
| + ['include', 'mac/bind_objc_block_unittest_arc\\.mm$'],
|
| + ['include', 'mac/scoped_nsobject_unittest_arc\\.mm$'],
|
| + ],
|
| + }]
|
| + ],
|
| + },
|
| + ],
|
| + }],
|
| ],
|
| }
|
|
|