sandbox/linux/sandbox_linux.gypi - 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: sandbox/linux/sandbox_linux.gypi

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: sandbox/linux/sandbox_linux.gypi

diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi

index 0fdb6bacfec2a76a3a0933bb60c8b468ec3a9516..16fd2c24b923c446538e567af27bc3a7c1de74c4 100644

--- a/sandbox/linux/sandbox_linux.gypi

+++ b/sandbox/linux/sandbox_linux.gypi

@@ -105,7 +105,7 @@

'type': 'shared_library',

'conditions': [

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

+ [ 'OS == "android"', {

'dependencies': [

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

@@ -319,8 +319,7 @@

}

}],

- # Strategy copied from base_unittests_apk in base/base.gyp.

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

+ [ 'OS=="android"', {

'targets': [

{

'target_name': 'sandbox_linux_jni_unittests_apk',

« no previous file with comments | « net/net.gyp ('k') | sql/sql.gyp » ('j') | no next file with comments »