Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # | 1 # |
| 2 # Copyright (C) 2011 Google Inc. All rights reserved. | 2 # Copyright (C) 2011 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 24 matching lines...) Expand all Loading... | |
| 35 { | 35 { |
| 36 # GN version: //third_party/WebKit/public:all_blink | 36 # GN version: //third_party/WebKit/public:all_blink |
| 37 'target_name': 'all_blink', | 37 'target_name': 'all_blink', |
| 38 'type': 'none', | 38 'type': 'none', |
| 39 'dependencies': [ | 39 'dependencies': [ |
| 40 '../Source/platform/blink_platform_tests.gyp:blink_heap_unittest s', | 40 '../Source/platform/blink_platform_tests.gyp:blink_heap_unittest s', |
| 41 '../Source/platform/blink_platform_tests.gyp:blink_platform_unit tests', | 41 '../Source/platform/blink_platform_tests.gyp:blink_platform_unit tests', |
| 42 '../Source/web/web_tests.gyp:webkit_unit_tests', | 42 '../Source/web/web_tests.gyp:webkit_unit_tests', |
| 43 '../Source/wtf/wtf_tests.gyp:wtf_unittests', | 43 '../Source/wtf/wtf_tests.gyp:wtf_unittests', |
| 44 ], | 44 ], |
| 45 'direct_dependent_settings': { | |
| 46 'include_dirs': [ '..' ], | |
|
jochen (gone - plz use gerrit)
2015/01/29 15:21:25
why do you need this change for GYP but not in GN?
tasak
2015/02/03 06:40:25
Yeah, we don't need this.
Done.
| |
| 47 'defines': [ | |
| 48 '<@(public_feature_defines)', | |
| 49 ], | |
| 50 }, | |
| 45 'conditions': [ | 51 'conditions': [ |
| 46 ['OS=="android" and android_webview_build==0', { | 52 ['OS=="android" and android_webview_build==0', { |
| 47 'dependencies': [ | 53 'dependencies': [ |
| 48 '../Source/platform/blink_platform_tests.gyp:blink_heap_ unittests_apk', | 54 '../Source/platform/blink_platform_tests.gyp:blink_heap_ unittests_apk', |
| 49 '../Source/platform/blink_platform_tests.gyp:blink_platf orm_unittests_apk', | 55 '../Source/platform/blink_platform_tests.gyp:blink_platf orm_unittests_apk', |
| 50 '../Source/web/web_tests.gyp:webkit_unit_tests_apk', | 56 '../Source/web/web_tests.gyp:webkit_unit_tests_apk', |
| 51 '../Source/wtf/wtf_tests.gyp:wtf_unittests_apk', | 57 '../Source/wtf/wtf_tests.gyp:wtf_unittests_apk', |
| 52 ], | 58 ], |
| 53 }], | 59 }], |
| 54 ], | 60 ], |
| 55 }, | 61 }, |
| 56 ], | 62 ], |
| 57 } | 63 } |
| OLD | NEW |