third_party/protobuf/proto_library.gni - Issue 2935953002: Fix protobuf's Python runtime and imports.

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: third_party/protobuf/proto_library.gni

Issue 2935953002: Fix protobuf's Python runtime and imports.

Patch Set: debug import path Created 3 years, 6 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: third_party/protobuf/proto_library.gni

diff --git a/third_party/protobuf/proto_library.gni b/third_party/protobuf/proto_library.gni

index 880a5af48dc927bc260e939fe96a2e4dd8f3479c..76498f0eec3ca257c7951b56a0366f4d02f33a16 100644

--- a/third_party/protobuf/proto_library.gni

+++ b/third_party/protobuf/proto_library.gni

@@ -327,7 +327,7 @@ template("proto_library") {

# use relative paths starting at |cc_out_dir|.

# However there is no necessity to add an additional directory, if all protos

# are located in the same directory which is in the search path by default.

- if (has_nested_dirs) {

+ if (has_nested_dirs && (generate_cc || generate_with_plugin)) {

config_name = "${target_name}_config"

config(config_name) {

include_dirs = [ cc_out_dir ]