GN: Add support for prebuilt instrumented libraries.

third_party/instrumented_libraries/instrumented_libraries.gyp

Index: third_party/instrumented_libraries/instrumented_libraries.gyp
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index 8f0bddafba55ae30b1307110a7789c41aa0821f6..6aef0c168e44905d9df050308b47a9fa4c0ccce3 100644
--- a/third_party/instrumented_libraries/instrumented_libraries.gyp
+++ b/third_party/instrumented_libraries/instrumented_libraries.gyp
@@ -94,11 +94,11 @@
           ['msan==1', {
             'conditions': [
               ['msan_track_origins==2', {
-                'archive_name': 'msan-chained-origins-<(_ubuntu_release)',
+                'archive_name': 'msan-chained-origins',
               }, {
                 'conditions': [
                   ['msan_track_origins==0', {
-                    'archive_name': 'msan-no-origins-<(_ubuntu_release)',
+                    'archive_name': 'msan-no-origins',
                   }, {
                     'archive_name': 'UNSUPPORTED_CONFIGURATION'
                   }],
@@ -110,18 +110,18 @@
       },
       'actions': [
         {
-          'action_name': 'unpack_<(archive_name).tgz',
+          'action_name': 'unpack_<(archive_name)-<(_ubuntu_release).tgz',
           'inputs': [
-            'binaries/<(archive_name).tgz',
+            'binaries/<(archive_name)-<(_ubuntu_release).tgz',
           ],
           'outputs': [
             '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/<(archive_name).txt',
           ],
           'action': [
-            'scripts/unpack_binaries.sh',
-            'binaries/<(archive_name).tgz',
+            'scripts/unpack_binaries.py',
+            '<(archive_name)',
+            'binaries',
             '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/',
-            '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/<(archive_name).txt',
           ],
         },
       ],