Commit 1a930476 authored by jvoung@google.com's avatar jvoung@google.com

Use ppapi_sources.gypi for nacl trusted build.scons like the untrusted...

Use ppapi_sources.gypi for nacl trusted build.scons like the untrusted nacl.scons does (mirroring nacl.scons changes in http://codereview.chromium.org/8727029/)

R=noelallen@chromium.org,bradnelson@chromium.org
BUG= none
TEST= ppNaClPlugin builds in nacl via scons.

Review URL: http://codereview.chromium.org/8769052

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112822 0039d316-1c4b-4281-b951-d872f2087c98
parent fc64692f
......@@ -21,14 +21,18 @@ if env.Bit('windows'):
env.FilterOut(CCFLAGS=['-Wswitch-enum'])
# Load ppapi_cpp.gypi
# Unfortunately gyp_extract does not handle variables or includes so we must
# pull the list of sources from ppapi_sources.gypi directly.
ppapi_sources_gypi = open(
env.File('$SOURCE_ROOT/ppapi/ppapi_sources.gypi').abspath, 'r').read()
ppapi_sources_list = eval(ppapi_sources_gypi)['variables']['cpp_sources']
ppapi_cpp_gypi = gyp_extract.LoadGypFile(
env.File('$SOURCE_ROOT/ppapi/ppapi_cpp.gypi').abspath)
# From ppapi_cpp.gypi:ppapi_cpp_objects:.*\.cc
# From ppapi_cpp.gypi:ppapi_cpp:.*\.cc
cpp_sources = (
gyp_extract.GypTargetSources(
ppapi_cpp_gypi, 'ppapi_cpp_objects', '.*\.cc') +
[src for src in ppapi_sources_list if src.endswith('.cc')] +
gyp_extract.GypTargetSources(
ppapi_cpp_gypi, 'ppapi_cpp', '.*\.cc')
)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment