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

Side by Side Diff: chrome/chrome_browser_chromeos.gypi

Issue 215633004: Fix chrome_api and extensions_api gyp dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser_chromeos', 9 'target_name': 'browser_chromeos',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 23 matching lines...) Expand all
34 'common/extensions/api/api.gyp:chrome_api', 34 'common/extensions/api/api.gyp:chrome_api',
35 'common_net', 35 'common_net',
36 'debugger', 36 'debugger',
37 'device_policy_proto', 37 'device_policy_proto',
38 'drive_proto', 38 'drive_proto',
39 'feedback_proto', 39 'feedback_proto',
40 'in_memory_url_index_cache_proto', 40 'in_memory_url_index_cache_proto',
41 'installer_util', 41 'installer_util',
42 'safe_browsing_proto', 42 'safe_browsing_proto',
43 'safe_browsing_report_proto', 43 'safe_browsing_report_proto',
44 '../third_party/re2/re2.gyp:re2',
45 '../breakpad/breakpad.gyp:breakpad_client', 44 '../breakpad/breakpad.gyp:breakpad_client',
46 '../build/linux/system.gyp:dbus', 45 '../build/linux/system.gyp:dbus',
47 '../chromeos/chromeos.gyp:chromeos', 46 '../chromeos/chromeos.gyp:chromeos',
48 '../chromeos/chromeos.gyp:chromeos_memory', 47 '../chromeos/chromeos.gyp:chromeos_memory',
49 # browser_chromeos #includes signed_secret.pb.h directly. 48 # browser_chromeos #includes signed_secret.pb.h directly.
50 '../chromeos/chromeos.gyp:cryptohome_signkey_proto', 49 '../chromeos/chromeos.gyp:cryptohome_signkey_proto',
51 # browser_chromeos #includes power_supply_properties.pb.h directly. 50 # browser_chromeos #includes power_supply_properties.pb.h directly.
52 '../chromeos/chromeos.gyp:power_manager_proto', 51 '../chromeos/chromeos.gyp:power_manager_proto',
53 '../chromeos/ime/input_method.gyp:gencode', 52 '../chromeos/ime/input_method.gyp:gencode',
54 '../components/components.gyp:cloud_policy_proto', 53 '../components/components.gyp:cloud_policy_proto',
(...skipping 22 matching lines...) Expand all
77 '../third_party/icu/icu.gyp:icui18n', 76 '../third_party/icu/icu.gyp:icui18n',
78 '../third_party/icu/icu.gyp:icuuc', 77 '../third_party/icu/icu.gyp:icuuc',
79 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 78 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
80 '../third_party/libevent/libevent.gyp:libevent', 79 '../third_party/libevent/libevent.gyp:libevent',
81 '../third_party/libjingle/libjingle.gyp:libjingle', 80 '../third_party/libjingle/libjingle.gyp:libjingle',
82 '../third_party/libusb/libusb.gyp:libusb', 81 '../third_party/libusb/libusb.gyp:libusb',
83 '../third_party/libxml/libxml.gyp:libxml', 82 '../third_party/libxml/libxml.gyp:libxml',
84 '../third_party/npapi/npapi.gyp:npapi', 83 '../third_party/npapi/npapi.gyp:npapi',
85 '../third_party/protobuf/protobuf.gyp:protobuf_lite', 84 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
86 '../third_party/protobuf/protobuf.gyp:protoc#host', 85 '../third_party/protobuf/protobuf.gyp:protoc#host',
86 '../third_party/re2/re2.gyp:re2',
87 '../third_party/zlib/zlib.gyp:zlib', 87 '../third_party/zlib/zlib.gyp:zlib',
88 '../ui/base/strings/ui_strings.gyp:ui_strings', 88 '../ui/base/strings/ui_strings.gyp:ui_strings',
89 '../ui/base/ui_base.gyp:ui_base', 89 '../ui/base/ui_base.gyp:ui_base',
90 '../ui/display/display.gyp:display', 90 '../ui/display/display.gyp:display',
91 '../ui/events/events.gyp:dom4_keycode_converter', 91 '../ui/events/events.gyp:dom4_keycode_converter',
92 '../ui/resources/ui_resources.gyp:ui_resources', 92 '../ui/resources/ui_resources.gyp:ui_resources',
93 '../ui/surface/surface.gyp:surface', 93 '../ui/surface/surface.gyp:surface',
94 '../ui/views/controls/webview/webview.gyp:webview', 94 '../ui/views/controls/webview/webview.gyp:webview',
95 '../ui/views/controls/webview/webview.gyp:webview', 95 '../ui/views/controls/webview/webview.gyp:webview',
96 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', 96 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
97 '../url/url.gyp:url_lib', 97 '../url/url.gyp:url_lib',
98 '../v8/tools/gyp/v8.gyp:v8', 98 '../v8/tools/gyp/v8.gyp:v8',
99 '../webkit/storage_browser.gyp:webkit_storage_browser', 99 '../webkit/storage_browser.gyp:webkit_storage_browser',
100 '../webkit/storage_common.gyp:webkit_storage_common', 100 '../webkit/storage_common.gyp:webkit_storage_common',
101 '../webkit/webkit_resources.gyp:webkit_resources', 101 '../webkit/webkit_resources.gyp:webkit_resources',
102 'chrome_resources.gyp:chrome_strings', 102 'chrome_resources.gyp:chrome_strings',
103 ], 103 ],
104 'defines': [ 104 'defines': [
105 '<@(nacl_defines)', 105 '<@(nacl_defines)',
106 ], 106 ],
107 'direct_dependent_settings': { 107 'direct_dependent_settings': {
108 'defines': [ 108 'defines': [
109 '<@(nacl_defines)', 109 '<@(nacl_defines)',
110 ], 110 ],
111 }, 111 },
112 'export_dependent_settings': [ 112 'export_dependent_settings': [
113 'common/extensions/api/api.gyp:chrome_api',
113 '../sync/sync.gyp:sync', 114 '../sync/sync.gyp:sync',
114 ], 115 ],
115 'include_dirs': [ 116 'include_dirs': [
116 # breakpad_linux.cc uses generated file_version_info_linux.h. 117 # breakpad_linux.cc uses generated file_version_info_linux.h.
117 '<(SHARED_INTERMEDIATE_DIR)', 118 '<(SHARED_INTERMEDIATE_DIR)',
118 '../breakpad/src', 119 '../breakpad/src',
119 ], 120 ],
120 'sources': [ 121 'sources': [
121 # All .cc, .h, .m, and .mm files under browser/chromeos, except for test s 122 # All .cc, .h, .m, and .mm files under browser/chromeos, except for test s
122 # and mocks. 123 # and mocks.
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 'browser/chromeos/attestation/attestation_signed_data.proto', 1066 'browser/chromeos/attestation/attestation_signed_data.proto',
1066 ], 1067 ],
1067 'variables': { 1068 'variables': {
1068 'proto_in_dir': 'browser/chromeos/attestation', 1069 'proto_in_dir': 'browser/chromeos/attestation',
1069 'proto_out_dir': 'chrome/browser/chromeos/attestation', 1070 'proto_out_dir': 'chrome/browser/chromeos/attestation',
1070 }, 1071 },
1071 'includes': [ '../build/protoc.gypi' ] 1072 'includes': [ '../build/protoc.gypi' ]
1072 }, 1073 },
1073 ], 1074 ],
1074 } 1075 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698