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

diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp

index b0ccb9936eb7c3022f46e797848b3eb30bbed03a..9d52a334512509451df69c88580301adfec5270f 100644

--- a/gpu/gpu.gyp

+++ b/gpu/gpu.gyp

@@ -281,7 +281,7 @@

'config/gpu_util_unittest.cc',

'conditions': [

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

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

'dependencies': [

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

@@ -350,7 +350,7 @@

'command_buffer/tests/occlusion_query_unittest.cc',

'conditions': [

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

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

'dependencies': [

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

@@ -591,7 +591,7 @@

}],

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

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

'targets': [

{

'target_name': 'gl_tests_apk',

« no previous file with comments | « content/content_tests.gypi ('k') | gpu/gpu_common.gypi » ('j') | no next file with comments »