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

Side by Side Diff: chrome/common/extensions/api/api.gyp

Issue 10852016: Move serial out of experimental. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolve merge conflicts. Created 8 years, 4 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 # 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'api', 8 'target_name': 'api',
9 'type': 'static_library', 9 'type': 'static_library',
10 'sources': [ 10 'sources': [
(...skipping 28 matching lines...) Expand all
39 'alarms.idl', 39 'alarms.idl',
40 'app_window.idl', 40 'app_window.idl',
41 'downloads.idl', 41 'downloads.idl',
42 'experimental_bluetooth.idl', 42 'experimental_bluetooth.idl',
43 'experimental_discovery.idl', 43 'experimental_discovery.idl',
44 'experimental_dns.idl', 44 'experimental_dns.idl',
45 'experimental_identity.idl', 45 'experimental_identity.idl',
46 'experimental_idltest.idl', 46 'experimental_idltest.idl',
47 'experimental_media_galleries.idl', 47 'experimental_media_galleries.idl',
48 'experimental_push_messaging.idl', 48 'experimental_push_messaging.idl',
49 'experimental_serial.idl',
50 'experimental_usb.idl', 49 'experimental_usb.idl',
51 'file_system.idl', 50 'file_system.idl',
51 'serial.idl',
52 'socket.idl', 52 'socket.idl',
53 ], 53 ],
54 'cc_dir': 'chrome/common/extensions/api', 54 'cc_dir': 'chrome/common/extensions/api',
55 'root_namespace': 'extensions::api', 55 'root_namespace': 'extensions::api',
56 }, 56 },
57 'conditions': [ 57 'conditions': [
58 ['OS=="android"', { 58 ['OS=="android"', {
59 'idl_schema_files!': [ 59 'idl_schema_files!': [
60 'experimental_usb.idl', 60 'experimental_usb.idl',
61 ], 61 ],
62 }], 62 }],
63 ['OS!="chromeos"', { 63 ['OS!="chromeos"', {
64 'json_schema_files!': [ 64 'json_schema_files!': [
65 'file_browser_handler_internal.json', 65 'file_browser_handler_internal.json',
66 ], 66 ],
67 }], 67 }],
68 ], 68 ],
69 }, 69 },
70 ], 70 ],
71 } 71 }
OLDNEW
« no previous file with comments | « chrome/common/extensions/api/_permission_features.json ('k') | chrome/common/extensions/api/experimental_serial.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698