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

Side by Side Diff: chromeos/chromeos.gyp

Issue 600753002: Remove incorrect dependency from chromeos.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 6 years, 2 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 unified diff | Download patch
« 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 '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 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 { 591 {
592 # GN version: //chromeos:chromeos_unittests 592 # GN version: //chromeos:chromeos_unittests
593 'target_name': 'chromeos_unittests', 593 'target_name': 'chromeos_unittests',
594 'type': 'executable', 594 'type': 'executable',
595 'dependencies': [ 595 'dependencies': [
596 '../base/base.gyp:run_all_unittests', 596 '../base/base.gyp:run_all_unittests',
597 '../base/base.gyp:test_support_base', 597 '../base/base.gyp:test_support_base',
598 '../build/linux/system.gyp:dbus', 598 '../build/linux/system.gyp:dbus',
599 '../build/linux/system.gyp:ssl', 599 '../build/linux/system.gyp:ssl',
600 '../components/components.gyp:onc_component', 600 '../components/components.gyp:onc_component',
601 '../content/content_shell_and_tests.gyp:test_support_content',
602 '../crypto/crypto.gyp:crypto', 601 '../crypto/crypto.gyp:crypto',
603 '../crypto/crypto.gyp:crypto_test_support', 602 '../crypto/crypto.gyp:crypto_test_support',
604 '../dbus/dbus.gyp:dbus_test_support', 603 '../dbus/dbus.gyp:dbus_test_support',
605 '../google_apis/google_apis.gyp:google_apis', 604 '../google_apis/google_apis.gyp:google_apis',
606 '../net/net.gyp:net', 605 '../net/net.gyp:net',
607 '../net/net.gyp:net_test_support', 606 '../net/net.gyp:net_test_support',
608 '../testing/gmock.gyp:gmock', 607 '../testing/gmock.gyp:gmock',
609 '../testing/gtest.gyp:gtest', 608 '../testing/gtest.gyp:gtest',
610 '../url/url.gyp:url_lib', 609 '../url/url.gyp:url_lib',
611 'chromeos_test_support', 610 'chromeos_test_support',
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto', 671 '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto',
673 ], 672 ],
674 'variables': { 673 'variables': {
675 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome', 674 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
676 'proto_out_dir': 'chromeos/cryptohome', 675 'proto_out_dir': 'chromeos/cryptohome',
677 }, 676 },
678 'includes': ['../build/protoc.gypi'], 677 'includes': ['../build/protoc.gypi'],
679 }, 678 },
680 ], 679 ],
681 } 680 }
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