| 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     # These are defined here because we need to build this library twice. Once | 8     # These are defined here because we need to build this library twice. Once | 
| 9     # with extra parameter checking. Once with no parameter checking to be 100% | 9     # with extra parameter checking. Once with no parameter checking to be 100% | 
| 10     # OpenGL ES 2.0 compliant for the conformance tests. | 10     # OpenGL ES 2.0 compliant for the conformance tests. | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
| 33   }, | 33   }, | 
| 34   'conditions': [ | 34   'conditions': [ | 
| 35     # Special target to wrap a gtest_target_type==shared_library | 35     # Special target to wrap a gtest_target_type==shared_library | 
| 36     # gpu_unittests into an android apk for execution. | 36     # gpu_unittests into an android apk for execution. | 
| 37     ['OS == "android" and gtest_target_type == "shared_library"', { | 37     ['OS == "android" and gtest_target_type == "shared_library"', { | 
| 38       'targets': [ | 38       'targets': [ | 
| 39         { | 39         { | 
| 40           'target_name': 'gpu_unittests_apk', | 40           'target_name': 'gpu_unittests_apk', | 
| 41           'type': 'none', | 41           'type': 'none', | 
| 42           'dependencies': [ | 42           'dependencies': [ | 
| 43             '../base/base.gyp:base_java', |  | 
| 44             'gpu_unittests', | 43             'gpu_unittests', | 
| 45           ], | 44           ], | 
| 46           'variables': { | 45           'variables': { | 
| 47             'test_suite_name': 'gpu_unittests', | 46             'test_suite_name': 'gpu_unittests', | 
| 48             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gpu_unitt
    ests<(SHARED_LIB_SUFFIX)', | 47             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gpu_unitt
    ests<(SHARED_LIB_SUFFIX)', | 
| 49           }, | 48           }, | 
| 50           'includes': [ '../build/apk_test.gypi' ], | 49           'includes': [ '../build/apk_test.gypi' ], | 
| 51         }, | 50         }, | 
| 52       ], | 51       ], | 
| 53     }], | 52     }], | 
| 54   ], | 53   ], | 
| 55 } | 54 } | 
| OLD | NEW | 
|---|