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

Side by Side Diff: chrome/chrome_common.gypi

Issue 666813002: GN: Fix Android component build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-clank
Patch Set: Actually undo gyp change 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 # File lists shared with GN build. 7 # File lists shared with GN build.
8 'chrome_common_sources': [ 8 'chrome_common_sources': [
9 'common/all_messages.h', 9 'common/all_messages.h',
10 'common/attrition_experiments.h', 10 'common/attrition_experiments.h',
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 'common/media_galleries/picasa_types.h', 265 'common/media_galleries/picasa_types.h',
266 'common/media_galleries/pmp_constants.h', 266 'common/media_galleries/pmp_constants.h',
267 ], 267 ],
268 'chrome_common_mac_sources': [ 268 'chrome_common_mac_sources': [
269 'common/media_galleries/iphoto_library.cc', 269 'common/media_galleries/iphoto_library.cc',
270 'common/media_galleries/iphoto_library.h', 270 'common/media_galleries/iphoto_library.h',
271 ] 271 ]
272 }, 272 },
273 'targets': [ 273 'targets': [
274 { 274 {
275 # GN: //chrome/common:common
jamesr 2014/10/22 00:28:18 //chrome/common means the same thing and is shorte
cjhopman 2014/10/23 00:15:48 For these pointers in GYP to the GN target, I've b
275 'target_name': 'common', 276 'target_name': 'common',
276 'type': 'static_library', 277 'type': 'static_library',
277 'variables': { 278 'variables': {
278 'chrome_common_target': 1, 279 'chrome_common_target': 1,
279 'enable_wexit_time_destructors': 1, 280 'enable_wexit_time_destructors': 1,
280 }, 281 },
281 'include_dirs': [ 282 'include_dirs': [
282 '..', 283 '..',
283 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_content_client.cc. 284 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_content_client.cc.
284 ], 285 ],
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 'common/safe_browsing/csd.proto' 680 'common/safe_browsing/csd.proto'
680 ], 681 ],
681 'variables': { 682 'variables': {
682 'proto_in_dir': 'common/safe_browsing', 683 'proto_in_dir': 'common/safe_browsing',
683 'proto_out_dir': 'chrome/common/safe_browsing', 684 'proto_out_dir': 'chrome/common/safe_browsing',
684 }, 685 },
685 'includes': [ '../build/protoc.gypi' ], 686 'includes': [ '../build/protoc.gypi' ],
686 }, 687 },
687 ], 688 ],
688 } 689 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698