OLD | NEW |
---|---|
1 # Copyright 2012 The Chromium Authors. All rights reserved. | 1 # Copyright 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 'variables': { | 5 'variables': { |
6 'chrome_unit_tests_sources': [ | 6 'chrome_unit_tests_sources': [ |
7 '../apps/saved_files_service_unittest.cc', | 7 '../apps/saved_files_service_unittest.cc', |
8 '../components/autofill/content/renderer/test_password_autofill_agent.cc', | 8 '../components/autofill/content/renderer/test_password_autofill_agent.cc', |
9 '../components/autofill/content/renderer/test_password_autofill_agent.h', | 9 '../components/autofill/content/renderer/test_password_autofill_agent.h', |
10 '../components/autofill/content/renderer/test_password_generation_agent.cc ', | 10 '../components/autofill/content/renderer/test_password_generation_agent.cc ', |
(...skipping 2824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2835 'target_name': 'unit_tests_apk', | 2835 'target_name': 'unit_tests_apk', |
2836 'type': 'none', | 2836 'type': 'none', |
2837 'dependencies': [ | 2837 'dependencies': [ |
2838 'chrome_java', | 2838 'chrome_java', |
2839 'unit_tests_java', | 2839 'unit_tests_java', |
2840 'unit_tests', | 2840 'unit_tests', |
2841 ], | 2841 ], |
2842 'variables': { | 2842 'variables': { |
2843 'test_suite_name': 'unit_tests', | 2843 'test_suite_name': 'unit_tests', |
2844 'android_manifest_path': 'test/android/unit_tests_apk/AndroidManifes t.xml', | 2844 'android_manifest_path': 'test/android/unit_tests_apk/AndroidManifes t.xml', |
2845 'conditions': [ | |
2846 ['v8_use_external_startup_data==1', { | |
2847 'additional_input_paths': [ | |
2848 '<(PRODUCT_DIR)/natives_blob.bin', | |
2849 '<(PRODUCT_DIR)/snapshot_blob.bin', | |
2850 ], | |
2851 }], | |
2852 ], | |
2845 }, | 2853 }, |
2854 'copies': [ | |
2855 { | |
2856 'destination': '<(PRODUCT_DIR)/unit_tests_apk/assets', | |
2857 'conditions': [ | |
2858 ['v8_use_external_startup_data==1', { | |
2859 'files': [ | |
2860 '<(PRODUCT_DIR)/natives_blob.bin', | |
2861 '<(PRODUCT_DIR)/snapshot_blob.bin', | |
2862 ], | |
2863 }], | |
2864 ], | |
2865 }, | |
2866 ], | |
rmcilroy
2014/10/06 15:41:02
I don't think the changes in this file are necessa
baixo
2014/10/07 14:53:27
Unfortunately it doesn't work without these change
| |
2846 'includes': [ '../build/apk_test.gypi' ], | 2867 'includes': [ '../build/apk_test.gypi' ], |
2847 }, | 2868 }, |
2848 ], | 2869 ], |
2849 }], | 2870 }], |
2850 ['test_isolation_mode != "noop"', { | 2871 ['test_isolation_mode != "noop"', { |
2851 'targets': [ | 2872 'targets': [ |
2852 { | 2873 { |
2853 'target_name': 'unit_tests_run', | 2874 'target_name': 'unit_tests_run', |
2854 'type': 'none', | 2875 'type': 'none', |
2855 'dependencies': [ | 2876 'dependencies': [ |
(...skipping 10 matching lines...) Expand all Loading... | |
2866 'dependencies': [ | 2887 'dependencies': [ |
2867 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2888 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
2868 ], | 2889 ], |
2869 }], | 2890 }], |
2870 ], | 2891 ], |
2871 }, | 2892 }, |
2872 ], | 2893 ], |
2873 }], | 2894 }], |
2874 ], # 'conditions' | 2895 ], # 'conditions' |
2875 } | 2896 } |
OLD | NEW |