Skip to content

Commit

Permalink
These targets were causing files to have the same output target, whic…
Browse files Browse the repository at this point in the history
…h ninja (reasonably) does not like.

dlldata.c is a generated file name that a bunch of idl build rules output but most do not actually compile it AFAICT. This was causing some targets in isimpledom (that contain multiple idl files) to output to the same name (dlldata.c), so uniquize it based on InputName. For the one target that seems to actually build dlldata.c, override back to the original name to keep things the same (iaccessible2).


Review URL: http://codereview.chromium.org/10008061

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131232 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
scottmg@chromium.org committed Apr 7, 2012
1 parent 5615ebd commit 4fdb3cc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build/common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -2861,7 +2861,7 @@
'TypeLibraryName': '$(InputName).tlb',
'OutputDirectory': '$(IntDir)',
'HeaderFileName': '$(InputName).h',
'DLLDataFileName': 'dlldata.c',
'DLLDataFileName': '$(InputName).dlldata.c',
'InterfaceIdentifierFileName': '$(InputName)_i.c',
'ProxyFileName': '$(InputName)_p.c',
},
Expand Down
3 changes: 2 additions & 1 deletion third_party/iaccessible2/iaccessible2.gyp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand All @@ -19,6 +19,7 @@
'msvs_settings': {
'VCMIDLTool': {
'OutputDirectory': '<(midl_out_dir)',
'DLLDataFileName': 'dlldata.c',
},
},
'direct_dependent_settings': {
Expand Down

0 comments on commit 4fdb3cc

Please sign in to comment.