Index: build/untrusted.gypi |
=================================================================== |
--- build/untrusted.gypi (revision 7377) |
+++ build/untrusted.gypi (working copy) |
@@ -35,6 +35,14 @@ |
'enable_x86_64': 1, |
'extra_deps64': [], |
'extra_deps32': [], |
+ # Separate the generated source from normal sources. |
+ # Normal sources will be scanned for header dependencies |
+ # using scan_sources.py, but generated sources will not be |
+ # available in time for that to happen. Thus, we separate out |
+ # generated sources and require that users list out the |
+ # dependencies of the generated_sources manually. |
+ 'generated_sources': [], |
+ 'generated_src_deps': [], |
'lib_dirs': [], |
'include_dirs': ['<(DEPTH)','<(DEPTH)/ppapi'], |
'defines': [ |
@@ -83,6 +91,8 @@ |
'<(DEPTH)/native_client/build/build_nexe.py', |
'<(DEPTH)/ppapi/ppapi_cpp.gypi', |
'>!@(>(get_sources) -I. -I.. >(sources))', |
+ '>@(generated_sources)', |
+ '>@(generated_src_deps)', |
'>@(extra_deps64)', |
], |
'outputs': ['>(out64)'], |
@@ -101,6 +111,7 @@ |
'>@(defines)', '-DNACL_BUILD_SUBARCH=64', |
'--link_flags', '-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64 >(link_flags) ', |
'>@(sources)', |
+ '>@(generated_sources)', |
], |
}, |
], |
@@ -127,6 +138,8 @@ |
'<(DEPTH)/native_client/build/build_nexe.py', |
'<(DEPTH)/ppapi/ppapi_cpp.gypi', |
'>!@(>(get_sources) -I. -I.. >(sources))', |
+ '>@(generated_sources)', |
+ '>@(generated_src_deps)', |
'>@(extra_deps64)', |
], |
'outputs': ['>(out64)'], |
@@ -145,6 +158,7 @@ |
'>@(defines)', '-DNACL_BUILD_SUBARCH=64', |
'--link_flags', '-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64 >(link_flags)', |
'>@(sources)', |
+ '>@(generated_sources)', |
], |
}, |
], |
@@ -171,6 +185,8 @@ |
'<(DEPTH)/native_client/build/build_nexe.py', |
'<(DEPTH)/ppapi/ppapi_cpp.gypi', |
'>!@(>(get_sources) -I. -I.. >(sources))', |
+ '>@(generated_sources)', |
+ '>@(generated_src_deps)', |
'>@(extra_deps32)', |
], |
'outputs': ['>(out32)'], |
@@ -189,6 +205,7 @@ |
'>@(defines)', '-DNACL_BUILD_SUBARCH=32', |
'--link_flags', '-m32 -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32 >(link_flags)', |
'>@(sources)', |
+ '>@(generated_sources)', |
], |
}, |
], |
@@ -215,6 +232,8 @@ |
'<(DEPTH)/native_client/build/build_nexe.py', |
'<(DEPTH)/ppapi/ppapi_cpp.gypi', |
'>!@(>(get_sources) -I. -I.. >(sources))', |
+ '>@(generated_sources)', |
+ '>@(generated_src_deps)', |
'>@(extra_deps32)', |
], |
'outputs': ['>(out32)'], |
@@ -233,6 +252,7 @@ |
'>@(defines)', '-DNACL_BUILD_SUBARCH=32', |
'--link_flags', '-m32 -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32 >(link_flags)', |
'>@(sources)', |
+ '>@(generated_sources)', |
], |
}, |
], |