Chromium Code Reviews| 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 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'test_support_content', | 8 'target_name': 'test_support_content', |
| 9 'type': 'static_library', | 9 'type': 'static_library', |
| 10 'defines!': ['CONTENT_IMPLEMENTATION'], | 10 'defines!': ['CONTENT_IMPLEMENTATION'], |
| (...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 679 # content_unittests into an android apk for execution. | 679 # content_unittests into an android apk for execution. |
| 680 # See base.gyp for TODO(jrg)s about this strategy. | 680 # See base.gyp for TODO(jrg)s about this strategy. |
| 681 ['OS == "android" and gtest_target_type == "shared_library"', { | 681 ['OS == "android" and gtest_target_type == "shared_library"', { |
| 682 'targets': [ | 682 'targets': [ |
| 683 { | 683 { |
| 684 'target_name': 'content_unittests_apk', | 684 'target_name': 'content_unittests_apk', |
| 685 'type': 'none', | 685 'type': 'none', |
| 686 'dependencies': [ | 686 'dependencies': [ |
| 687 '../base/base.gyp:base_java', | 687 '../base/base.gyp:base_java', |
| 688 'content_java', | 688 'content_java', |
| 689 'content_unittests', | 689 'content_unittests', |
|
nilesh
2012/07/20 03:01:15
You should add an explicit dependency on the rule
Shouqun Liu
2012/07/20 03:12:03
Done.
| |
| 690 ], | 690 ], |
| 691 'variables': { | 691 'variables': { |
| 692 'test_suite_name': 'content_unittests', | 692 'test_suite_name': 'content_unittests', |
| 693 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_u nittests<(SHARED_LIB_SUFFIX)', | 693 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_u nittests<(SHARED_LIB_SUFFIX)', |
| 694 'input_jars_paths': [ | 694 'input_jars_paths': [ |
| 695 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', | 695 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', |
| 696 '<(PRODUCT_DIR)/lib.java/chromium_content.jar', | 696 '<(PRODUCT_DIR)/lib.java/chromium_content.jar', |
| 697 '<(PRODUCT_DIR)/lib.java/chromium_net.jar', | |
| 697 ], | 698 ], |
| 698 }, | 699 }, |
| 699 'includes': [ '../build/apk_test.gypi' ], | 700 'includes': [ '../build/apk_test.gypi' ], |
| 700 }, | 701 }, |
| 701 ], | 702 ], |
| 702 }], | 703 }], |
| 703 ], | 704 ], |
| 704 } | 705 } |
| OLD | NEW |