diff options
| author | dpranke <dpranke@chromium.org> | 2015-02-19 18:55:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-20 02:56:07 +0000 |
| commit | 4327621a322c964a8bc6d1ef5a4534f0f877d63e (patch) | |
| tree | eb4397f38579a5d7dcb821a8873e4006187dd450 /chrome_elf | |
| parent | 05b60060481868d9d6892f05e25e33e7934d1284 (diff) | |
| download | chromium_src-4327621a322c964a8bc6d1ef5a4534f0f877d63e.zip chromium_src-4327621a322c964a8bc6d1ef5a4534f0f877d63e.tar.gz chromium_src-4327621a322c964a8bc6d1ef5a4534f0f877d63e.tar.bz2 | |
Update Chomium's build files to work w/ latest GN binaries.
The latest GN binaries rename cpu_arch to current_cpu and/or target_cpu
as appropriate, build_cpu_arch to host_cpu, and os to current_os and target_os as appropriate.
R=brettw@chromium.org
TBR=ddorwin@chromium.org
EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg
BUG=344767
Review URL: https://codereview.chromium.org/913373002
Cr-Commit-Position: refs/heads/master@{#317223}
Diffstat (limited to 'chrome_elf')
| -rw-r--r-- | chrome_elf/BUILD.gn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_elf/BUILD.gn b/chrome_elf/BUILD.gn index b58c829..74a217f 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" ] } |