chrome/chrome_tests_unit.gypi - Issue 136693011: Disable incognito if parental controls are enabled on android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: chrome/chrome_tests_unit.gypi

diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi

index 0c72a920f2771fc548cac29dcd3ce7a59791c9e9..ec36a699fdd823e755437ecc20e4e63c2772c4b1 100644

--- a/chrome/chrome_tests_unit.gypi

+++ b/chrome/chrome_tests_unit.gypi

@@ -2798,15 +2798,28 @@

['OS == "android" and gtest_target_type == "shared_library"', {

'targets': [

{

+ 'target_name': 'unit_tests_java',

+ 'type': 'none',

+ 'variables': {

+ 'java_in_dir': 'test/android/unit_tests_apk',

+ },

+ 'dependencies': [

+ 'chrome_java',

+ ],

+ 'includes': [ '../build/java.gypi' ],

+ },

+ {

'target_name': 'unit_tests_apk',

'type': 'none',

'dependencies': [

'chrome_java',

+ 'unit_tests_java',

'unit_tests',

'variables': {

'test_suite_name': 'unit_tests',

'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)unit_tests<(SHARED_LIB_SUFFIX)',

+ 'android_manifest_path': 'test/android/unit_tests_apk/AndroidManifest.xml',

'includes': [ '../build/apk_test.gypi' ],