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

Side by Side Diff: build/apk_test.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
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 # This file is meant to be included into a target to provide a rule 5 # This file is meant to be included into a target to provide a rule
6 # to build APK based test suites. 6 # to build APK based test suites.
7 # 7 #
8 # To use this, create a gyp target with the following form: 8 # To use this, create a gyp target with the following form:
9 # { 9 # {
10 # 'target_name': 'test_suite_name_apk', 10 # 'target_name': 'test_suite_name_apk',
(...skipping 13 matching lines...) Expand all
24 '<(DEPTH)/tools/android/android_tools.gyp:android_tools', 24 '<(DEPTH)/tools/android/android_tools.gyp:android_tools',
25 ], 25 ],
26 'conditions': [ 26 'conditions': [
27 ['OS == "android" and gtest_target_type == "shared_library"', { 27 ['OS == "android" and gtest_target_type == "shared_library"', {
28 'variables': { 28 'variables': {
29 # These are used to configure java_apk.gypi included below. 29 # These are used to configure java_apk.gypi included below.
30 'apk_name': '<(test_suite_name)', 30 'apk_name': '<(test_suite_name)',
31 'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk', 31 'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk',
32 'final_apk_path': '<(intermediate_dir)/<(test_suite_name)-debug.apk', 32 'final_apk_path': '<(intermediate_dir)/<(test_suite_name)-debug.apk',
33 'java_in_dir': '<(DEPTH)/testing/android/java', 33 'java_in_dir': '<(DEPTH)/testing/android/java',
34 'android_manifest_path': '<(DEPTH)/testing/android/AndroidManifest.xml' ,
35 'native_lib_target': 'lib<(test_suite_name)', 34 'native_lib_target': 'lib<(test_suite_name)',
36 # TODO(yfriedman, cjhopman): Support managed installs for gtests. 35 # TODO(yfriedman, cjhopman): Support managed installs for gtests.
37 'gyp_managed_install': 0, 36 'gyp_managed_install': 0,
38 }, 37 },
39 'includes': [ 'java_apk.gypi' ], 38 'includes': [ 'java_apk.gypi' ],
40 }], # 'OS == "android" and gtest_target_type == "shared_library" 39 }], # 'OS == "android" and gtest_target_type == "shared_library"
41 ], # conditions 40 ], # conditions
42 } 41 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698