Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(966)

Unified Diff: ppapi/native_client/src/shared/ppapi/build.scons

Issue 8769052: Use ppapi_sources.gypi for nacl trusted build.scons like the untrusted nacl.scons does. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/native_client/src/shared/ppapi/build.scons
diff --git a/ppapi/native_client/src/shared/ppapi/build.scons b/ppapi/native_client/src/shared/ppapi/build.scons
index 4bc1dc61e7aa618889b6a95ceed437890c445493..ed7c3033b22d3aabfdf474a23695650cc6308a15 100644
--- a/ppapi/native_client/src/shared/ppapi/build.scons
+++ b/ppapi/native_client/src/shared/ppapi/build.scons
@@ -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')
)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698