Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1225)

Unified Diff: build/common.gypi

Issue 309253003: Move system_libdir to a deeper variable dict to fix issue 369119 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index f9c9427d89ef1b64d6f484fcd90397c8a0a34aaf..dc8517ac4f3838bc5643f79d9e8077341873466a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -166,6 +166,9 @@
'sysroot%': '',
'chroot_cmd%': '',
+ # The system libdir used for this ABI.
+ 'system_libdir%': 'lib',
+
'conditions': [
# Ash needs Aura.
['use_aura==0', {
@@ -261,6 +264,7 @@
'arm_version%': '<(arm_version)',
'sysroot%': '<(sysroot)',
'chroot_cmd%': '<(chroot_cmd)',
+ 'system_libdir%': '<(system_libdir)',
# Set to 1 to enable fast builds. Set to 2 for even faster builds
# (it disables debug info for fastest compilation - only for use
@@ -288,8 +292,6 @@
# Detect NEON support at run-time.
'arm_neon_optional%': 0,
- # The system libdir used for this ABI.
- 'system_libdir%': 'lib',
# Use libjpeg-turbo as the JPEG codec used by Chromium.
'use_libjpeg_turbo%': 1,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698