Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 136693011: Disable incognito if parental controls are enabled on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Keep native_test as the package to be compliant w/ testing framework Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 'targets': [ 5 'targets': [
6 { 6 {
7 # This target contains mocks and test utilities that don't belong in 7 # This target contains mocks and test utilities that don't belong in
8 # production libraries but are used by more than one test executable. 8 # production libraries but are used by more than one test executable.
9 'target_name': 'test_support_common', 9 'target_name': 'test_support_common',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 2780 matching lines...) Expand 10 before | Expand all | Expand 10 after
2791 ], 2791 ],
2792 }, 2792 },
2793 ], 2793 ],
2794 2794
2795 'conditions': [ 2795 'conditions': [
2796 # Special target to wrap a gtest_target_type==shared_library 2796 # Special target to wrap a gtest_target_type==shared_library
2797 # unit_tests into an android apk for execution. 2797 # unit_tests into an android apk for execution.
2798 ['OS == "android" and gtest_target_type == "shared_library"', { 2798 ['OS == "android" and gtest_target_type == "shared_library"', {
2799 'targets': [ 2799 'targets': [
2800 { 2800 {
2801 'target_name': 'unit_tests_java',
2802 'type': 'none',
2803 'variables': {
2804 'java_in_dir': 'test/android/unit_tests_apk',
2805 },
2806 'dependencies': [
2807 'chrome_java',
2808 ],
2809 'includes': [ '../build/java.gypi' ],
2810 },
2811 {
2801 'target_name': 'unit_tests_apk', 2812 'target_name': 'unit_tests_apk',
2802 'type': 'none', 2813 'type': 'none',
2803 'dependencies': [ 2814 'dependencies': [
2804 'chrome_java', 2815 'chrome_java',
2816 'unit_tests_java',
2805 'unit_tests', 2817 'unit_tests',
2806 ], 2818 ],
2807 'variables': { 2819 'variables': {
2808 'test_suite_name': 'unit_tests', 2820 'test_suite_name': 'unit_tests',
2809 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)unit_test s<(SHARED_LIB_SUFFIX)', 2821 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)unit_test s<(SHARED_LIB_SUFFIX)',
2822 'android_manifest_path': 'test/android/unit_tests_apk/AndroidManifes t.xml',
2810 }, 2823 },
2811 'includes': [ '../build/apk_test.gypi' ], 2824 'includes': [ '../build/apk_test.gypi' ],
2812 }, 2825 },
2813 ], 2826 ],
2814 }], 2827 }],
2815 ['test_isolation_mode != "noop"', { 2828 ['test_isolation_mode != "noop"', {
2816 'targets': [ 2829 'targets': [
2817 { 2830 {
2818 'target_name': 'unit_tests_run', 2831 'target_name': 'unit_tests_run',
2819 'type': 'none', 2832 'type': 'none',
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
2877 'browser/ui/app_list/test/fake_profile_store.h', 2890 'browser/ui/app_list/test/fake_profile_store.h',
2878 'browser/ui/app_list/test/fast_show_pickler_unittest.cc', 2891 'browser/ui/app_list/test/fast_show_pickler_unittest.cc',
2879 'browser/ui/views/app_list/linux/app_list_linux_unittest.cc', 2892 'browser/ui/views/app_list/linux/app_list_linux_unittest.cc',
2880 'browser/ui/views/app_list/win/app_list_win_unittest.cc', 2893 'browser/ui/views/app_list/win/app_list_win_unittest.cc',
2881 ], 2894 ],
2882 }, 2895 },
2883 ], 2896 ],
2884 }], 2897 }],
2885 ], # 'conditions' 2898 ], # 'conditions'
2886 } 2899 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/incognito_mode_prefs.cc ('k') | chrome/test/android/unit_tests_apk/AndroidManifest.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698