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

Unified Diff: content/content_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
« no previous file with comments | « content/content_common_mojo_bindings.gyp ('k') | content/content_jni.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_gpu.gypi
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi
deleted file mode 100644
index 420dab86c6f2db7ebe2eb52c577e9083862634cf..0000000000000000000000000000000000000000
--- a/content/content_gpu.gypi
+++ /dev/null
@@ -1,59 +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.
-
-{
- 'dependencies': [
- '../base/base.gyp:base',
- '../gpu/gpu.gyp:command_buffer_traits',
- '../gpu/gpu.gyp:gpu',
- '../gpu/gpu.gyp:gpu_ipc_service',
- '../media/gpu/ipc/media_ipc.gyp:media_gpu_ipc_service',
- '../media/media.gyp:media_gpu',
- '../skia/skia.gyp:skia',
- '../ui/gl/gl.gyp:gl',
- '../ui/gl/init/gl_init.gyp:gl_init',
- 'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
- ],
- 'sources': [
- 'gpu/gpu_child_thread.cc',
- 'gpu/gpu_child_thread.h',
- 'gpu/gpu_main.cc',
- 'gpu/gpu_process.cc',
- 'gpu/gpu_process.h',
- 'gpu/gpu_service_factory.cc',
- 'gpu/gpu_service_factory.h',
- 'gpu/in_process_gpu_thread.cc',
- 'gpu/in_process_gpu_thread.h',
- 'public/gpu/content_gpu_client.cc',
- 'public/gpu/content_gpu_client.h',
- ],
- 'include_dirs': [
- '..',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'include_dirs': [
- '<(DEPTH)/third_party/khronos',
- # ANGLE libs picked up from ui/gl
- '<(angle_path)/src',
- '<(DEPTH)/third_party/wtl/include',
- ],
- 'link_settings': {
- 'libraries': [
- '-lsetupapi.lib',
- ],
- },
- }],
- ['target_arch!="arm" and chromeos == 1', {
- 'include_dirs': [
- '<(DEPTH)/third_party/libva',
- ],
- }],
- ['OS=="android"', {
- 'dependencies': [
- '<(DEPTH)/media/media.gyp:player_android',
- ],
- }],
- ],
-}
« no previous file with comments | « content/content_common_mojo_bindings.gyp ('k') | content/content_jni.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698