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

Side by Side Diff: webrtc/build/protoc.gypi

Issue 1903553005: Remove root dir from protoc.gypi include paths. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 # Copied from Chromium's src/build/protoc.gypi 9 # Copied from Chromium's src/build/protoc.gypi
10 # 10 #
11 # It was necessary to copy this file to WebRTC, because the path to 11 # It was necessary to copy this file to WebRTC, because the path to
12 # build/common.gypi is different for the standalone and Chromium builds. Gyp 12 # build/common.gypi is different for the standalone and Chromium builds. Gyp
13 # doesn't permit conditional inclusion or variable expansion in include paths. 13 # doesn't permit conditional inclusion or variable expansion in include paths.
14 # http://code.google.com/p/gyp/wiki/InputFormatReference#Including_Other_Files 14 # http://code.google.com/p/gyp/wiki/InputFormatReference#Including_Other_Files
15 #
16 # Local changes:
17 # * Removed <(DEPTH) from include_dir due to difficulties with generated
18 # downstream code.
19
15 20
16 # This file is meant to be included into a target to provide a rule 21 # This file is meant to be included into a target to provide a rule
17 # to invoke protoc in a consistent manner. For Java-targets, see 22 # to invoke protoc in a consistent manner. For Java-targets, see
18 # protoc_java.gypi. 23 # protoc_java.gypi.
19 # 24 #
20 # To use this, create a gyp target with the following form: 25 # To use this, create a gyp target with the following form:
21 # { 26 # {
22 # 'target_name': 'my_proto_lib', 27 # 'target_name': 'my_proto_lib',
23 # 'type': 'static_library', 28 # 'type': 'static_library',
24 # 'sources': [ 29 # 'sources': [
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 '<(protoc)', 109 '<(protoc)',
105 '--cpp_out', '<(cc_generator_options)<(cc_dir)', 110 '--cpp_out', '<(cc_generator_options)<(cc_dir)',
106 '--python_out', '<(py_dir)', 111 '--python_out', '<(py_dir)',
107 ], 112 ],
108 'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)', 113 'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)',
109 'process_outputs_as_sources': 1, 114 'process_outputs_as_sources': 1,
110 }, 115 },
111 ], 116 ],
112 'include_dirs': [ 117 'include_dirs': [
113 '<(SHARED_INTERMEDIATE_DIR)/protoc_out', 118 '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
114 '<(DEPTH)',
115 ], 119 ],
116 'direct_dependent_settings': { 120 'direct_dependent_settings': {
117 'include_dirs': [ 121 'include_dirs': [
118 '<(SHARED_INTERMEDIATE_DIR)/protoc_out', 122 '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
119 '<(DEPTH)',
120 ] 123 ]
121 }, 124 },
122 # This target exports a hard dependency because it generates header 125 # This target exports a hard dependency because it generates header
123 # files. 126 # files.
124 'hard_dependency': 1, 127 'hard_dependency': 1,
125 'conditions': [ 128 'conditions': [
126 ['build_protobuf==1', { 129 ['build_protobuf==1', {
127 'dependencies': [ 130 'dependencies': [
128 '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host', 131 '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
129 '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite', 132 '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
130 ], 133 ],
131 'export_dependent_settings': [ 134 'export_dependent_settings': [
132 # The generated headers reference headers within protobuf_lite, 135 # The generated headers reference headers within protobuf_lite,
133 # so dependencies must be able to find those headers too. 136 # so dependencies must be able to find those headers too.
134 '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite', 137 '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
135 ], 138 ],
136 }], 139 }],
137 ], 140 ],
138 } 141 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698