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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 '<(DEPTH)/skia/skia.gyp:skia', | 56 '<(DEPTH)/skia/skia.gyp:skia', |
57 ], | 57 ], |
58 'defines': [ | 58 'defines': [ |
59 'BLINK_COMMON_IMPLEMENTATION=1', | 59 'BLINK_COMMON_IMPLEMENTATION=1', |
60 'INSIDE_BLINK', | 60 'INSIDE_BLINK', |
61 ], | 61 ], |
62 'include_dirs': [ | 62 'include_dirs': [ |
63 '<(SHARED_INTERMEDIATE_DIR)/blink', | 63 '<(SHARED_INTERMEDIATE_DIR)/blink', |
64 ], | 64 ], |
65 'sources': [ | 65 'sources': [ |
| 66 'exported/FilePathConversion.cpp', |
66 'exported/URLConversion.cpp', | 67 'exported/URLConversion.cpp', |
67 'exported/WebCString.cpp', | 68 'exported/WebCString.cpp', |
68 'exported/WebCommon.cpp', | 69 'exported/WebCommon.cpp', |
69 'exported/WebString.cpp', | 70 'exported/WebString.cpp', |
70 ], | 71 ], |
71 }, | 72 }, |
72 { | 73 { |
73 'target_name': 'blink_heap_asm_stubs', | 74 'target_name': 'blink_heap_asm_stubs', |
74 'type': 'static_library', | 75 'type': 'static_library', |
75 # VS2010 does not correctly incrementally link obj files generated | 76 # VS2010 does not correctly incrementally link obj files generated |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
422 ['OS=="android"', { | 423 ['OS=="android"', { |
423 'cflags!': ['-mthumb'], | 424 'cflags!': ['-mthumb'], |
424 }], | 425 }], |
425 ], | 426 ], |
426 },{ # target_arch!="arm" | 427 },{ # target_arch!="arm" |
427 'type': 'none', | 428 'type': 'none', |
428 }], | 429 }], |
429 ], | 430 ], |
430 }], | 431 }], |
431 } | 432 } |
OLD | NEW |