| 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   'variables': { | 6   'variables': { | 
| 7     'chromium_code': 1, | 7     'chromium_code': 1, | 
| 8   }, | 8   }, | 
| 9   'includes': [ | 9   'includes': [ | 
| 10     'ipc.gypi', | 10     'ipc.gypi', | 
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 125     }], | 125     }], | 
| 126     # Special target to wrap a gtest_target_type==shared_library | 126     # Special target to wrap a gtest_target_type==shared_library | 
| 127     # ipc_tests into an android apk for execution. | 127     # ipc_tests into an android apk for execution. | 
| 128     # See base.gyp for TODO(jrg)s about this strategy. | 128     # See base.gyp for TODO(jrg)s about this strategy. | 
| 129     ['OS == "android" and gtest_target_type == "shared_library"', { | 129     ['OS == "android" and gtest_target_type == "shared_library"', { | 
| 130       'targets': [ | 130       'targets': [ | 
| 131         { | 131         { | 
| 132           'target_name': 'ipc_tests_apk', | 132           'target_name': 'ipc_tests_apk', | 
| 133           'type': 'none', | 133           'type': 'none', | 
| 134           'dependencies': [ | 134           'dependencies': [ | 
| 135             '../base/base.gyp:base_java', |  | 
| 136             'ipc_tests', | 135             'ipc_tests', | 
| 137           ], | 136           ], | 
| 138           'variables': { | 137           'variables': { | 
| 139             'test_suite_name': 'ipc_tests', | 138             'test_suite_name': 'ipc_tests', | 
| 140             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ipc_tests
     <(SHARED_LIB_SUFFIX)', | 139             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ipc_tests
     <(SHARED_LIB_SUFFIX)', | 
| 141           }, | 140           }, | 
| 142           'includes': [ '../build/apk_test.gypi' ], | 141           'includes': [ '../build/apk_test.gypi' ], | 
| 143         }], | 142         }], | 
| 144     }], | 143     }], | 
| 145   ], | 144   ], | 
| 146 } | 145 } | 
| OLD | NEW | 
|---|