Index: third_party/instrumented_libraries/standard_instrumented_package_target.gypi |
diff --git a/third_party/instrumented_libraries/standard_instrumented_package_target.gypi b/third_party/instrumented_libraries/standard_instrumented_package_target.gypi |
index 195adabc9b166021b5c3246f44071e098848702e..2d01aa87d0430d603488160591e02977e0711395 100644 |
--- a/third_party/instrumented_libraries/standard_instrumented_package_target.gypi |
+++ b/third_party/instrumented_libraries/standard_instrumented_package_target.gypi |
@@ -27,13 +27,10 @@ |
'--extra-configure-flags=>(_extra_configure_flags)', |
'--cflags=>(_package_cflags)', |
'--ldflags=>(_package_ldflags)', |
- '--patch=>(_patch)', |
- '--run-before-build=>(_run_before_build)', |
'--cc=<(_cc)', |
'--cxx=<(_cxx)', |
'--jobs=>(_jobs)', |
'--build-method=>(_build_method)', |
- '--sanitizer-blacklist=>(_sanitizer_blacklist)', |
], |
'conditions': [ |
['verbose_libraries_build==1', { |
@@ -44,15 +41,29 @@ |
], |
'target_conditions': [ |
['">(_patch)"!=""', { |
+ 'action+': [ |
+ '--patch=>(_patch)', |
+ ], |
'inputs+': [ |
'>(_patch)', |
], |
}], |
['">(_run_before_build)"!=""', { |
+ 'action+': [ |
+ '--run-before-build=>(_run_before_build)', |
+ ], |
'inputs+': [ |
'>(_run_before_build)', |
], |
}], |
+ ['">(_<(_sanitizer_type)_blacklist)"!=""', { |
+ 'action+': [ |
+ '--sanitizer-blacklist=>(_<(_sanitizer_type)_blacklist)', |
+ ], |
+ 'inputs+': [ |
+ '>(_<(_sanitizer_type)_blacklist)', |
+ ], |
+ }], |
], |
}, |
], |