| Index: webkit/support/setup_third_party.gyp
|
| diff --git a/webkit/support/setup_third_party.gyp b/webkit/support/setup_third_party.gyp
|
| index 247c991549ab351d2f1ec00945bac6725dfbd602..035a8a49d57859a796b214f6441650d7006e7b05 100644
|
| --- a/webkit/support/setup_third_party.gyp
|
| +++ b/webkit/support/setup_third_party.gyp
|
| @@ -5,8 +5,9 @@
|
| {
|
| 'variables': {
|
| 'setup_third_party_cmd': ['python', 'setup_third_party.py'],
|
| - 'destination': '<(SHARED_INTERMEDIATE_DIR)/webkit/third_party/WebKit/Source/WebKit/chromium/public',
|
| - 'destination_mac': '<(SHARED_INTERMEDIATE_DIR)/webkit/third_party/WebKit/Source/WebKit/mac/WebCoreSupport',
|
| + 'webkit_client_api_dest': '<(SHARED_INTERMEDIATE_DIR)/webkit/third_party/WebKit/Source/WebKit/chromium/public',
|
| + 'platform_api_dest': '<(SHARED_INTERMEDIATE_DIR)/webkit/third_party/WebKit/Source/Platform/chromium/public',
|
| + 'mac_webcoresupport_dest': '<(SHARED_INTERMEDIATE_DIR)/webkit/third_party/WebKit/Source/WebKit/mac/WebCoreSupport',
|
| },
|
| 'targets': [
|
| {
|
| @@ -19,22 +20,39 @@
|
| },
|
| 'actions': [
|
| {
|
| - 'action_name': 'third_party_forwarding_headers',
|
| + 'action_name': 'third_party_webkit_client_api_forwarding_headers',
|
| 'inputs': [
|
| '<!@(<(setup_third_party_cmd) inputs <(DEPTH)/public)',
|
| 'setup_third_party.py',
|
| ],
|
| 'outputs': [
|
| - "<!@(<(setup_third_party_cmd) outputs <(DEPTH)/public '<(destination)')",
|
| + "<!@(<(setup_third_party_cmd) outputs <(DEPTH)/public '<(webkit_client_api_dest)')",
|
| ],
|
| 'action': [
|
| '<@(setup_third_party_cmd)',
|
| 'setup_headers',
|
| '<(DEPTH)/public',
|
| - '<(destination)',
|
| + '<(webkit_client_api_dest)',
|
| ],
|
| 'message': 'Generating forwarding headers for third_party/WebKit/Source/WebKit/chromium/public',
|
| },
|
| + {
|
| + 'action_name': 'third_party_platform_api_forwarding_headers',
|
| + 'inputs': [
|
| + '<!@(<(setup_third_party_cmd) inputs <(DEPTH)/../../Platform/chromium/public)',
|
| + 'setup_third_party.py',
|
| + ],
|
| + 'outputs': [
|
| + "<!@(<(setup_third_party_cmd) outputs <(DEPTH)/../../Platform/chromium/public '<(platform_api_dest)')",
|
| + ],
|
| + 'action': [
|
| + '<@(setup_third_party_cmd)',
|
| + 'setup_headers',
|
| + '<(DEPTH)/../../Platform/chromium/public',
|
| + '<(platform_api_dest)',
|
| + ],
|
| + 'message': 'Generating forwarding headers for third_party/WebKit/Source/Platform/chromium/public',
|
| + },
|
| ],
|
| 'conditions': [
|
| ['OS=="mac"', {
|
| @@ -46,13 +64,13 @@
|
| 'setup_third_party.py',
|
| ],
|
| 'outputs': [
|
| - "<!@(<(setup_third_party_cmd) outputs <(DEPTH)/../mac/WebCoreSupport '<(destination_mac)')",
|
| + "<!@(<(setup_third_party_cmd) outputs <(DEPTH)/../mac/WebCoreSupport '<(mac_webcoresupport_dest)')",
|
| ],
|
| 'action': [
|
| '<@(setup_third_party_cmd)',
|
| 'setup_headers',
|
| '<(DEPTH)/../mac/WebCoreSupport',
|
| - '<(destination_mac)',
|
| + '<(mac_webcoresupport_dest)',
|
| ],
|
| 'message': 'Generating forwarding headers for third_party/WebKit/Source/WebKit/mac/WebCoreSupport',
|
| },
|
|
|