cc/cc_tests.gyp - Issue 278443003: Android: cleanup gtest_target_type conditions.

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: cc/cc_tests.gyp

Issue 278443003: Android: cleanup gtest_target_type conditions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 6 years, 7 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: cc/cc_tests.gyp

diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp

index 218a14017584035f778220ff0244eb4508755f2f..f02d8cb061f998a0d841a28d43c9cd725fac8f9f 100644

--- a/cc/cc_tests.gyp

+++ b/cc/cc_tests.gyp

@@ -263,7 +263,7 @@

'.',

'conditions': [

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

+ ['OS == "android"',

{

'dependencies': [

'../testing/android/native_test.gyp:native_test_native_code',

@@ -323,7 +323,7 @@

'.',

'conditions': [

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

+ ['OS == "android"',

{

'dependencies': [

'../testing/android/native_test.gyp:native_test_native_code',

@@ -375,9 +375,7 @@

'conditions': [

- # Special target to wrap a gtest_target_type==shared_library

- # cc_unittests into an android apk for execution.

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

+ ['OS == "android"',

{

'targets': [

{

« no previous file with comments | « build/apk_test.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »