diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 02:30:03 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 02:30:03 +0000 |
| commit | 7091950e07f2485ccbce0e9874e17cd5d8e347ec (patch) | |
| tree | 3ba6b15ce774251440b277d4f69605dca297790a /native_client_sdk | |
| parent | 9f7fdfbc7211b34428ad7409ded82a607df998f5 (diff) | |
| download | chromium_src-7091950e07f2485ccbce0e9874e17cd5d8e347ec.zip chromium_src-7091950e07f2485ccbce0e9874e17cd5d8e347ec.tar.gz chromium_src-7091950e07f2485ccbce0e9874e17cd5d8e347ec.tar.bz2 | |
Pepper: Change '*_sources' variables in ppapi_sources.gypi to '*_source_files'.
This makes gyp properly relativize the paths; see
<http://code.google.com/p/gyp/wiki/InputFormatReference#Pathname_Relativization>.
TEST=builds + trybots
TBR=noelallen@chromium.org
Review URL: http://codereview.chromium.org/8975001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rw-r--r-- | native_client_sdk/src/build_tools/build.scons | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/native_client_sdk/src/build_tools/build.scons b/native_client_sdk/src/build_tools/build.scons index 067c03f..708b5b7 100644 --- a/native_client_sdk/src/build_tools/build.scons +++ b/native_client_sdk/src/build_tools/build.scons @@ -164,21 +164,22 @@ ppapi_gl_gypi = gyp_extract.LoadGypFile(os.path.join(ppapi_base, 'ppapi_gl.gypi')) # From ppapi_cpp.gypi:ppapi_c:c/[^/]*\.h -c_headers = GypSources(ppapi_sources_map['c_sources'], 'c/[^/]*\.h') +c_headers = GypSources(ppapi_sources_map['c_source_files'], 'c/[^/]*\.h') # From ppapi_cpp.gypi:ppapi_c:c/dev/[^/]*\.h -c_dev_headers = GypSources(ppapi_sources_map['c_sources'], 'c/dev/[^/]*\.h') +c_dev_headers = GypSources(ppapi_sources_map['c_source_files'], + 'c/dev/[^/]*\.h') # From ppapi_cpp.gypi:ppapi_cpp_objects:cpp/[^/]*\.h # From ppapi_cpp.gypi:ppapi_cpp:cpp/[^/]*\.h cpp_headers = ( - GypSources(ppapi_sources_map['cpp_sources'], 'cpp/[^/]*\.h') + + GypSources(ppapi_sources_map['cpp_source_files'], 'cpp/[^/]*\.h') + gyp_extract.GypTargetSources( ppapi_cpp_gypi, 'ppapi_cpp', 'cpp/[^/]*\.h') ) # From ppapi_cpp.gypi:ppapi_cpp_objects:cpp/dev/[^/]*\.h -cpp_dev_headers = GypSources(ppapi_sources_map['cpp_sources'], +cpp_dev_headers = GypSources(ppapi_sources_map['cpp_source_files'], 'cpp/dev/[^/]*\.h') # From ppapi_gl.gypi:ppapi_gles2:.*\.h @@ -204,7 +205,7 @@ cpp_dev_header_install = env.AddHeaderToSdk( # From ppapi_cpp.gypi:ppapi_cpp_objects:cpp/[^/]*\.cc # From ppapi_cpp.gypi:ppapi_cpp:cpp/[^/]*\.cc cpp_trusted_sources = ( - GypSources(ppapi_sources_map['cpp_sources'], 'cpp/[^/]*\.cc') + + GypSources(ppapi_sources_map['cpp_source_files'], 'cpp/[^/]*\.cc') + gyp_extract.GypTargetSources( ppapi_cpp_gypi, 'ppapi_cpp', 'cpp/[^/]*\.cc') ) |