third_party/leveldatabase/leveldatabase.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: third_party/leveldatabase/leveldatabase.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: third_party/leveldatabase/leveldatabase.gyp

diff --git a/third_party/leveldatabase/leveldatabase.gyp b/third_party/leveldatabase/leveldatabase.gyp

index 58504f39e2ebb5d6005155f4d65dc2d6944b4281..3ba3829d8a7612fd8eecc5eb56885e12e4abb228 100644

--- a/third_party/leveldatabase/leveldatabase.gyp

+++ b/third_party/leveldatabase/leveldatabase.gyp

@@ -14,8 +14,7 @@

'use_snappy': 0,

}],

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

- # Wrap env_chromium_unittests into an android apk for execution.

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

'targets': [{

'target_name': 'env_chromium_unittests_apk',

'type': 'none',

@@ -196,7 +195,7 @@

'env_chromium_unittest.cc',

'conditions': [

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

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

'type': 'shared_library',

'dependencies': [

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

« no previous file with comments | « sync/sync_tests.gypi ('k') | ui/events/events.gyp » ('j') | no next file with comments »