| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 'includes': [ | 5 'includes': [ |
| 6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso
urces. | 6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso
urces. |
| 7 '../../build/util/version.gypi' | 7 '../../build/util/version.gypi' |
| 8 ], | 8 ], |
| 9 'variables': { | 9 'variables': { |
| 10 'chromium_code': 1, | 10 'chromium_code': 1, |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 }], | 120 }], |
| 121 # conditions for order_text_section | 121 # conditions for order_text_section |
| 122 # Cygprofile methods need to be linked into the instrumented build. | 122 # Cygprofile methods need to be linked into the instrumented build. |
| 123 ['order_profiling!=0', { | 123 ['order_profiling!=0', { |
| 124 'conditions': [ | 124 'conditions': [ |
| 125 ['OS=="android"', { | 125 ['OS=="android"', { |
| 126 'dependencies': [ '../../tools/cygprofile/cygprofile.gyp:cygprofil
e' ], | 126 'dependencies': [ '../../tools/cygprofile/cygprofile.gyp:cygprofil
e' ], |
| 127 }], | 127 }], |
| 128 ], | 128 ], |
| 129 }], # order_profiling!=0 | 129 }], # order_profiling!=0 |
| 130 ['use_allocator!="none"', { | |
| 131 'dependencies': [ | |
| 132 '../../base/allocator/allocator.gyp:allocator', | |
| 133 ], | |
| 134 }], | |
| 135 ], | 130 ], |
| 136 }, | 131 }, |
| 137 { | 132 { |
| 138 # GN: //chrome/android:chrome_public | 133 # GN: //chrome/android:chrome_public |
| 139 'target_name': 'libchrome_public', | 134 'target_name': 'libchrome_public', |
| 140 'type': 'shared_library', | 135 'type': 'shared_library', |
| 141 'sources': [ | 136 'sources': [ |
| 142 '<@(chrome_public_app_native_sources)', | 137 '<@(chrome_public_app_native_sources)', |
| 143 ], | 138 ], |
| 144 'dependencies': [ | 139 'dependencies': [ |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 423 } | 418 } |
| 424 ], | 419 ], |
| 425 ], | 420 ], |
| 426 } | 421 } |
| 427 | 422 |
| 428 # Local Variables: | 423 # Local Variables: |
| 429 # tab-width:2 | 424 # tab-width:2 |
| 430 # indent-tabs-mode:nil | 425 # indent-tabs-mode:nil |
| 431 # End: | 426 # End: |
| 432 # vim: set expandtab tabstop=2 shiftwidth=2: | 427 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |