chrome_elf/BUILD.gn - Issue 913373002: Update Chomium's build files to work w/ latest GN binaries.

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: chrome_elf/BUILD.gn

Issue 913373002: Update Chomium's build files to work w/ latest GN binaries. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn_cpu_arch_changes

Patch Set: merge to #317214 Created 5 years, 10 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: chrome_elf/BUILD.gn

diff --git a/chrome_elf/BUILD.gn b/chrome_elf/BUILD.gn

index b58c82918a0ecdff4a4a4fc5beae1d25562adcb3..74a217f276dd21cdfac03445aec83624bfa8b7cb 100644

--- a/chrome_elf/BUILD.gn

+++ b/chrome_elf/BUILD.gn

@@ -32,7 +32,7 @@ shared_library("chrome_elf") {

"/NODEFAULTLIB:user32.lib",

"/DEF:" + rebase_path("chrome_elf.def"),

]

- if (cpu_arch == "x86") {

+ if (current_cpu == "x86") {

# Don"t set an x64 base address (to avoid breaking HE-ASLR).

ldflags += [ "/BASE:0x01c20000" ]

}

@@ -96,7 +96,7 @@ if (is_component_build) {

configs += [ "//build/config/win:windowed" ]

ldflags = [ "/DEF:" + rebase_path("chrome_redirects.def") ]

- if (cpu_arch == "x86") {

+ if (current_cpu == "x86") {

# Don't set an x64 base address (to avoid breaking HE-ASLR).

ldflags += [ "/BASE:0x01c20000" ]

}

« no previous file with comments | « chrome/test/BUILD.gn ('k') | components/policy/BUILD.gn » ('j') | third_party/widevine/cdm/BUILD.gn » ('J')