Instrumented libraries: the much-needed build script rewrite.

third_party/instrumented_libraries/standard_instrumented_package_target.gypi

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 ac2e1c35ad06d21de0f50caa3f1a5b112912aead..b6253f55739bc88dd4913b014b271bf8692933da 100644
--- a/third_party/instrumented_libraries/standard_instrumented_package_target.gypi
+++ b/third_party/instrumented_libraries/standard_instrumented_package_target.gypi
@@ -20,17 +20,18 @@
         '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/<(_package_name).txt',
       ],
       'action': ['./download_build_install.py',
-        '--product-directory=<(PRODUCT_DIR)',
-        '--package=<(_package_name)',
-        '--intermediate-directory=<(INTERMEDIATE_DIR)',
-        '--sanitizer-type=<(_sanitizer_type)',
-        '--extra-configure-flags=>(_extra_configure_flags)',
-        '--cflags=>(_package_cflags)',
-        '--ldflags=>(_package_ldflags)',
+        '--build-method=>(_build_method)',
         '--cc=<(_cc)',
+        '--cflags=>(_package_cflags)',
         '--cxx=<(_cxx)',
+        '--extra-configure-flags=>(_extra_configure_flags)',
+        '--intermediate-dir=<(INTERMEDIATE_DIR)',
         '--jobs=>(_jobs)',
-        '--build-method=>(_build_method)',
+        '--ldflags=>(_package_ldflags)',
+        '--libdir=<(_libdir)',
+        '--package=<(_package_name)',
+        '--product-dir=<(PRODUCT_DIR)',
+        '--sanitizer=<(_sanitizer_type)',
       ],
       'conditions': [
         ['verbose_libraries_build==1', {