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

Unified Diff: content/browser/tracing/tracing_resources.gyp

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/browser/speech/proto/speech_proto.gyp ('k') | content/content.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tracing/tracing_resources.gyp
diff --git a/content/browser/tracing/tracing_resources.gyp b/content/browser/tracing/tracing_resources.gyp
deleted file mode 100644
index df12689a9b193cecd3b19320e64ed896ce733149..0000000000000000000000000000000000000000
--- a/content/browser/tracing/tracing_resources.gyp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2013 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.
-
-{
- 'variables': {
- 'trace_viewer_src_dir': '../../../third_party/catapult/tracing',
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing',
- },
- 'targets': [
- {
- # GN version: //content/browser/tracing:generate_tracing_grd
- 'target_name': 'generate_tracing_grd',
- 'type': 'none',
- 'hard_dependency': 1,
- 'dependencies': [
- '<(trace_viewer_src_dir)/trace_viewer.gyp:generate_about_tracing',
- ],
- 'actions': [
- {
- 'action_name': 'generate_tracing_grd',
- 'script_name': 'generate_trace_viewer_grd.py',
- 'input_pages': [
- '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/about_tracing.html',
- '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/about_tracing.js'
- ],
- 'inputs': [
- '<@(_script_name)',
- '<@(_input_pages)'
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd'
- ],
- 'action': [
- 'python', '<@(_script_name)', '<@(_input_pages)', '--output', '<@(_outputs)'
- ]
- }
- ]
- },
-
- {
- # GN version: //content/browser/tracing:resources
- 'target_name': 'tracing_resources',
- 'type': 'none',
- 'hard_dependency': 1,
- 'dependencies': [
- '<(trace_viewer_src_dir)/trace_viewer.gyp:generate_about_tracing',
- 'generate_tracing_grd',
- ],
- 'variables': {
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing',
- },
- 'actions': [
- {
- 'action_name': 'tracing_resources',
- # This can't use build/grit_action.gypi because the grd file
- # is generated at build time, so the trick of using grit_info to get
- # the real inputs/outputs at GYP time isn't possible.
- 'variables': {
- 'grit_cmd': ['python', '../../../tools/grit/grit.py'],
- 'grit_grd_file': '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd',
- 'grit_rc_header_format%': '',
-
- 'conditions': [
- # These scripts can skip writing generated files if they are
- # identical to the already existing files, which avoids further
- # build steps, like recompilation. However, a dependency (earlier
- # build step) having a newer timestamp than an output (later
- # build step) confuses some build systems, so only use this on
- # ninja, which explicitly supports this use case (gyp turns all
- # actions into ninja restat rules).
- ['"<(GENERATOR)"=="ninja"', {
- 'write_only_new': '1',
- }, {
- 'write_only_new': '0',
- }],
- ],
- },
- 'inputs': [
- '<(grit_grd_file)',
- '<(DEPTH)/tools/gritsettings/resource_ids',
- '<!@pymod_do_main(grit_info --inputs)',
- ],
- 'outputs': [
- '<(grit_out_dir)/grit/tracing_resources.h',
- '<(grit_out_dir)/tracing_resources.pak',
- ],
- 'action': ['<@(grit_cmd)',
- '-i', '<(grit_grd_file)', 'build',
- '-f', '<(DEPTH)/tools/gritsettings/resource_ids',
- '-o', '<(grit_out_dir)',
- '--write-only-new=<(write_only_new)',
- '-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)',
- '<@(grit_defines)',
- '<@(grit_rc_header_format)'],
- 'message': 'Generating resources from <(grit_grd_file)',
- }
- ],
- 'includes': [ '../../../build/grit_target.gypi' ]
- }
- ]
-}
« no previous file with comments | « content/browser/speech/proto/speech_proto.gyp ('k') | content/content.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698