OLD | NEW |
---|---|
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 'variables': { | 5 'variables': { |
6 'chromium_code': 1, | 6 'chromium_code': 1, |
7 'package_name': 'chromium_testshell', | 7 'package_name': 'chromium_testshell', |
8 }, | 8 }, |
9 'includes': [ | 9 'includes': [ |
10 'chrome_android_paks.gypi', # Included for the list of pak resources. | 10 'chrome_android_paks.gypi', # Included for the list of pak resources. |
(...skipping 30 matching lines...) Expand all Loading... | |
41 'conditions': [ | 41 'conditions': [ |
42 [ 'OS=="android"', { | 42 [ 'OS=="android"', { |
43 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ], | 43 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ], |
44 }], | 44 }], |
45 ], | 45 ], |
46 }], | 46 }], |
47 [ 'android_use_tcmalloc==1', { | 47 [ 'android_use_tcmalloc==1', { |
48 'dependencies': [ | 48 'dependencies': [ |
49 '../base/allocator/allocator.gyp:allocator', ], | 49 '../base/allocator/allocator.gyp:allocator', ], |
50 }], | 50 }], |
51 [ 'android_app_abi != "x86"', { | |
52 'ldflags': [ | |
53 # Do not allow text relocations. | |
54 '-Wl,--fatal-warnings', | |
Yaron
2013/07/02 00:56:06
Should be put this instead near werror in build/co
| |
55 '-Wl,--warn-shared-textrel', | |
56 ], | |
57 }], | |
51 ], | 58 ], |
52 }, | 59 }, |
53 { | 60 { |
54 'target_name': 'chromium_testshell', | 61 'target_name': 'chromium_testshell', |
55 'type': 'none', | 62 'type': 'none', |
56 'dependencies': [ | 63 'dependencies': [ |
57 '../media/media.gyp:media_java', | 64 '../media/media.gyp:media_java', |
58 'chrome.gyp:chrome_java', | 65 'chrome.gyp:chrome_java', |
59 'chromium_testshell_paks', | 66 'chromium_testshell_paks', |
60 'libchromiumtestshell', | 67 'libchromiumtestshell', |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
153 { | 160 { |
154 'destination': '<(chrome_android_pak_output_folder)', | 161 'destination': '<(chrome_android_pak_output_folder)', |
155 'files': [ | 162 'files': [ |
156 '<@(chrome_android_pak_input_resources)', | 163 '<@(chrome_android_pak_input_resources)', |
157 ], | 164 ], |
158 } | 165 } |
159 ], | 166 ], |
160 }, | 167 }, |
161 ], | 168 ], |
162 } | 169 } |
OLD | NEW |