OLD | NEW |
1 # | 1 # |
2 # Copyright (C) 2013 Google Inc. All rights reserved. | 2 # Copyright (C) 2013 Google Inc. All rights reserved. |
3 # | 3 # |
4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
6 # met: | 6 # met: |
7 # | 7 # |
8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 ], | 55 ], |
56 'defines': [ | 56 'defines': [ |
57 'BLINK_COMMON_IMPLEMENTATION=1', | 57 'BLINK_COMMON_IMPLEMENTATION=1', |
58 'INSIDE_BLINK', | 58 'INSIDE_BLINK', |
59 ], | 59 ], |
60 'include_dirs': [ | 60 'include_dirs': [ |
61 '<(SHARED_INTERMEDIATE_DIR)/blink', | 61 '<(SHARED_INTERMEDIATE_DIR)/blink', |
62 ], | 62 ], |
63 'sources': [ | 63 'sources': [ |
64 'exported/WebCString.cpp', | 64 'exported/WebCString.cpp', |
| 65 'exported/WebCommon.cpp', |
65 'exported/WebString.cpp', | 66 'exported/WebString.cpp', |
66 'exported/WebCommon.cpp', | 67 'exported/WebStringUTF8Adaptor.cpp', |
67 ], | 68 ], |
68 }, | 69 }, |
69 { | 70 { |
70 'target_name': 'blink_heap_asm_stubs', | 71 'target_name': 'blink_heap_asm_stubs', |
71 'type': 'static_library', | 72 'type': 'static_library', |
72 # VS2010 does not correctly incrementally link obj files generated | 73 # VS2010 does not correctly incrementally link obj files generated |
73 # from asm files. This flag disables UseLibraryDependencyInputs to | 74 # from asm files. This flag disables UseLibraryDependencyInputs to |
74 # avoid this problem. | 75 # avoid this problem. |
75 'msvs_2010_disable_uldi_when_referenced': 1, | 76 'msvs_2010_disable_uldi_when_referenced': 1, |
76 'includes': [ | 77 'includes': [ |
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
465 ['OS=="android"', { | 466 ['OS=="android"', { |
466 'cflags!': ['-mthumb'], | 467 'cflags!': ['-mthumb'], |
467 }], | 468 }], |
468 ], | 469 ], |
469 },{ # target_arch!="arm" | 470 },{ # target_arch!="arm" |
470 'type': 'none', | 471 'type': 'none', |
471 }], | 472 }], |
472 ], | 473 ], |
473 }], | 474 }], |
474 } | 475 } |
OLD | NEW |