diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-10 02:33:58 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-10 02:33:58 +0000 |
| commit | bb3369ae47a2fe1e8f2ea50cd3be2ded609d6b36 (patch) | |
| tree | a80a3d198575620746c45ec0608af99f2dbb961e /webkit | |
| parent | ea15a97eb5b397aaaf338f97f33087454b3566bb (diff) | |
| download | chromium_src-bb3369ae47a2fe1e8f2ea50cd3be2ded609d6b36.zip chromium_src-bb3369ae47a2fe1e8f2ea50cd3be2ded609d6b36.tar.gz chromium_src-bb3369ae47a2fe1e8f2ea50cd3be2ded609d6b36.tar.bz2 | |
Teach webkit/support/setup_third_party.gyp about the Platform API
In a chromium-inside-WebKit checkout, there is no third_party/WebKit
directory but files inside chromium's webkit/ tree have absolute include
paths. This is resolved by a script that copies the header into the
output dir in the expected path.
This updates the script to know about the Platform API header locations.
BUG=none
Review URL: http://codereview.chromium.org/9147017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116989 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/support/setup_third_party.gyp | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/webkit/support/setup_third_party.gyp b/webkit/support/setup_third_party.gyp index 247c991..3b83fce 100644 --- a/webkit/support/setup_third_party.gyp +++ b/webkit/support/setup_third_party.gyp @@ -1,12 +1,13 @@ -# Copyright (c) 2010 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. { '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', }, |