| 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 # These files lists are shared with the GN build. | 8 # These files lists are shared with the GN build. |
| 9 'chromeos_sources': [ | 9 'chromeos_sources': [ |
| 10 'accelerometer/accelerometer_reader.cc', | 10 'accelerometer/accelerometer_reader.cc', |
| (...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 664 '../url/url.gyp:url_lib', | 664 '../url/url.gyp:url_lib', |
| 665 'chromeos_test_support', | 665 'chromeos_test_support', |
| 666 'cryptohome_proto', | 666 'cryptohome_proto', |
| 667 'power_manager_proto', | 667 'power_manager_proto', |
| 668 ], | 668 ], |
| 669 'sources': [ '<@(chromeos_test_sources)' ], | 669 'sources': [ '<@(chromeos_test_sources)' ], |
| 670 'include_dirs': [ | 670 'include_dirs': [ |
| 671 '..', | 671 '..', |
| 672 ], | 672 ], |
| 673 'conditions': [ | 673 'conditions': [ |
| 674 [ 'use_allocator!="none"', { | |
| 675 'dependencies': [ | |
| 676 '../base/allocator/allocator.gyp:allocator', | |
| 677 ], | |
| 678 }, | |
| 679 ], | |
| 680 ['use_binder == 1', { | 674 ['use_binder == 1', { |
| 681 'sources': [ '<@(chromeos_binder_test_sources)' ], | 675 'sources': [ '<@(chromeos_binder_test_sources)' ], |
| 682 'conditions': [ | 676 'conditions': [ |
| 683 ['target_arch == "arm" or target_arch == "ia32"', { | 677 ['target_arch == "arm" or target_arch == "ia32"', { |
| 684 'defines': [ | 678 'defines': [ |
| 685 'BINDER_IPC_32BIT', | 679 'BINDER_IPC_32BIT', |
| 686 ], | 680 ], |
| 687 }], | 681 }], |
| 688 ], | 682 ], |
| 689 }], | 683 }], |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 750 '../build/isolate.gypi', | 744 '../build/isolate.gypi', |
| 751 ], | 745 ], |
| 752 'sources': [ | 746 'sources': [ |
| 753 'chromeos_unittests.isolate', | 747 'chromeos_unittests.isolate', |
| 754 ], | 748 ], |
| 755 }, | 749 }, |
| 756 ], | 750 ], |
| 757 }], | 751 }], |
| 758 ], | 752 ], |
| 759 } | 753 } |
| OLD | NEW |