build/toolchain/gcc_toolchain.gni - Issue 1473273002: GN(Android): Add libosmesa.so to ContentShell.apk

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: build/toolchain/gcc_toolchain.gni

Issue 1473273002: GN(Android): Add libosmesa.so to ContentShell.apk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: comments Created 5 years 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: build/toolchain/gcc_toolchain.gni

diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni

index ec138b1781858bb553bf2cc638da5d09df8fb2cb..99c0c70bd4b5de474e99658e583c12781513099c 100644

--- a/build/toolchain/gcc_toolchain.gni

+++ b/build/toolchain/gcc_toolchain.gni

@@ -322,7 +322,11 @@ template("gcc_toolchain") {

# Use this for {{output_extension}} expansions unless a target manually

# overrides it (in which case {{output_extension}} will be what the target

# specifies).

- default_output_extension = default_shlib_extension

+ if (defined(invoker.loadable_module_extension)) {

+ default_output_extension = invoker.loadable_module_extension

+ } else {

+ default_output_extension = default_shlib_extension

+ }

output_prefix = "lib"

« no previous file with comments | « build/toolchain/android/BUILD.gn ('k') | content/shell/android/BUILD.gn » ('j') | no next file with comments »