build/config/android/config.gni - Issue 571953002: android_webview: Build against NDK prebuilts, not system libraries.

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/config/android/config.gni

Issue 571953002: android_webview: Build against NDK prebuilts, not system libraries. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix library link order on arm64 Created 6 years, 2 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

Index: build/config/android/config.gni

diff --git a/build/config/android/config.gni b/build/config/android/config.gni

index a8701fb9ae1e77b72724342c34a3354b5c722160..82f83463fdd8b22ef5ef918d70ac3dafa0d2be84 100644

--- a/build/config/android/config.gni

+++ b/build/config/android/config.gni

@@ -119,11 +119,7 @@ if (is_android) {

# stlport stuff --------------------------------------------------------------

- use_system_stlport = is_android_webview_build

- if (use_system_stlport) {

- android_stlport_library = "stlport"

- } else if (component_mode == "shared_library") {

+ if (component_mode == "shared_library") {

android_stlport_library = "stlport_shared"

} else {

android_stlport_library = "stlport_static"

@@ -149,5 +145,4 @@ if (is_android) {

if (!defined(is_android_webview_build)) {

is_android_webview_build = false

}

- use_system_stlport = false

}

« no previous file with comments | « build/common.gypi ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »