Instrumented libraries: move build-flags-related logic to the GYP file.

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_library_target.gypi b/third_party/instrumented_libraries/standard_instrumented_package_target.gypi
similarity index 61%
rename from third_party/instrumented_libraries/standard_instrumented_library_target.gypi
rename to third_party/instrumented_libraries/standard_instrumented_package_target.gypi
index 3aaf862ad31bf0e8931b400c02efa55c532a7805..5caa901f6308e0edc42f41f091af666124a5ab05 100644
--- a/third_party/instrumented_libraries/standard_instrumented_library_target.gypi
+++ b/third_party/instrumented_libraries/standard_instrumented_package_target.gypi
@@ -3,37 +3,36 @@
 # found in the LICENSE file.
 
 # This file is meant to be included into a target for instrumented dynamic
-# libraries and describes standard build action for most of the libraries.
+# packages and describes standard build action for most of the packages.
 
 {
-  'target_name': '<(_sanitizer_type)-<(_library_name)',
+  'target_name': '<(_sanitizer_type)-<(_package_name)',
   'type': 'none',
   'actions': [
     {
-      'action_name': '<(_library_name)',
+      'action_name': '<(_package_name)',
       'inputs': [
         # TODO(earthdok): reintroduce some sort of dependency
         # See http://crbug.com/343515
         #'download_build_install.py',
       ],
       'outputs': [
-        '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/<(_library_name).txt',
+        '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/<(_package_name).txt',
       ],
       'action': ['<(DEPTH)/third_party/instrumented_libraries/download_build_install.py',
         '--product-directory=<(PRODUCT_DIR)',
-        '--library=<(_library_name)',
+        '--package=<(_package_name)',
         '--intermediate-directory=<(INTERMEDIATE_DIR)',
         '--sanitizer-type=<(_sanitizer_type)',
-        '--extra-configure-flags=<(_extra_configure_flags)',
-        '--extra-cflags=<(_extra_cflags)',
-        '--extra-cxxflags=<(_extra_cxxflags)',
-        '--extra-ldflags=<(_extra_ldflags)',
-        '--run-before-build=<(_run_before_build)',
+        '--extra-configure-flags=>(_extra_configure_flags)',
+        '--cflags=>(_package_cflags)',
+        '--ldflags=>(_package_ldflags)',
+        '--run-before-build=>(_run_before_build)',
         '--cc=<(_cc)',
         '--cxx=<(_cxx)',
-        '--jobs=<(_jobs)',
-        '--build-method=<(_build_method)',
-        '--sanitizer-blacklist=<(_sanitizer_blacklist)',
+        '--jobs=>(_jobs)',
+        '--build-method=>(_build_method)',
+        '--sanitizer-blacklist=>(_sanitizer_blacklist)',
       ],
       'conditions': [
         ['verbose_libraries_build==1', {