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

Side by Side Diff: sandbox/linux/sandbox_linux.gypi

Issue 11649044: Fix Android x86 build with a quick hack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['OS=="linux"', { 8 ['OS=="linux"', {
9 'compile_suid_client': 1, 9 'compile_suid_client': 1,
10 }, { 10 }, {
11 'compile_suid_client': 0, 11 'compile_suid_client': 0,
12 }], 12 }],
13 ['(OS=="linux" or OS=="android") and (target_arch=="ia32" ' 13 ['((OS=="linux" or (OS=="android" and target_arch=="arm")) and '
14 'or target_arch=="x64" or target_arch=="arm")', { 14 '(target_arch=="ia32" or target_arch=="x64" or '
15 'target_arch=="arm"))', {
15 'compile_seccomp_bpf': 1, 16 'compile_seccomp_bpf': 1,
16 }, { 17 }, {
17 'compile_seccomp_bpf': 0, 18 'compile_seccomp_bpf': 0,
18 }], 19 }],
19 ], 20 ],
20 }, 21 },
21 'target_defaults': { 22 'target_defaults': {
22 'target_conditions': [ 23 'target_conditions': [
23 # All linux/ files will automatically be excluded on Android 24 # All linux/ files will automatically be excluded on Android
24 # so make sure we re-include them explicitly. 25 # so make sure we re-include them explicitly.
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 'input_shlib_path': 216 'input_shlib_path':
216 '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sandbox_linux_unittests' 217 '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sandbox_linux_unittests'
217 '<(SHARED_LIB_SUFFIX)', 218 '<(SHARED_LIB_SUFFIX)',
218 }, 219 },
219 'includes': [ '../../build/apk_test.gypi' ], 220 'includes': [ '../../build/apk_test.gypi' ],
220 } 221 }
221 ], 222 ],
222 }], 223 }],
223 ], 224 ],
224 } 225 }
OLDNEW
« 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