Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Unified Diff: content/browser/gpu/test_support_gpu.gypi

Issue 2321743002: Inline content_[tests/browser/android].gypi into GN build. (Closed)
Patch Set: gen file fix Created 4 years, 3 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:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/gpu/test_support_gpu.gypi
diff --git a/content/browser/gpu/test_support_gpu.gypi b/content/browser/gpu/test_support_gpu.gypi
deleted file mode 100644
index ac54822ad7069e429181cc11d3d8092b66870c12..0000000000000000000000000000000000000000
--- a/content/browser/gpu/test_support_gpu.gypi
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file is meant to be included into targets which run gpu tests.
-{
- 'variables': {
- 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/test/gpu',
- 'src_dir': '../../..',
- },
- 'defines': [
- 'HAS_OUT_OF_PROC_TEST_RUNNER',
- ],
- 'include_dirs': [
- '<(src_dir)',
- '<(test_list_out_dir)',
- ],
- # hard_dependency is necessary for this target because it has actions
- # that generate a header file included by dependent targets. The header
- # file must be generated before the dependents are compiled. The usual
- # semantics are to allow the two targets to build concurrently.
- 'hard_dependency': 1,
- 'conditions': [
- ['OS=="win"', {
- 'include_dirs': [
- '<(DEPTH)/third_party/wtl/include',
- ],
- 'configurations': {
- 'Debug': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
- },
- },
- },
- },
- }],
- ['OS=="mac"', {
- # See comments about "xcode_settings" elsewhere in this file.
- 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
- }],
- ['chromeos==1 or (OS=="linux" and use_aura==1)', {
- 'dependencies': [
- '<(src_dir)/build/linux/system.gyp:nss',
- ],
- }],
- ['toolkit_views==1', {
- 'dependencies': [
- '<(src_dir)/ui/views/views.gyp:views',
- ],
- }],
- ],
-}
« no previous file with comments | « content/browser/devtools/devtools_resources.gyp ('k') | content/browser/notifications/notification_proto.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698