Refactoring unpack_lib_posix and obj_int_extract.

libvpx.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'libvpx_build_vp9%': 1,
     'libvpx_source%': 'source/libvpx',
     'conditions': [
       ['os_posix==1', {
         'asm_obj_extension': 'o',
@@ skipping 378 matching lines @@
       # This target is a hard dependency because the generated .asm files
       # are needed all assembly optimized files in libvpx.
       'target_name': 'gen_asm_offsets_vp8',
       'type': 'none',
       'hard_dependency': 1,
       'dependencies': [
         'libvpx_asm_offsets_vp8',
         'libvpx_obj_int_extract#host',
       ],
       'variables' : {
-        'lib_intermediate_path' : '',
+        'lib_intermediate_name' : '',
+        'output_format':'',
+        'output_dir': '<(shared_generated_dir)',
         'conditions' : [
           ['android_webview_build==1', {
-            'lib_intermediate_path' : '<(android_src)/$(call intermediates-dir-for, STATIC_LIBRARIES, libvpx_asm_offsets_vp8)/libvpx_asm_offsets_vp8.a',
+            'lib_intermediate_name' : '<(android_src)/$(call intermediates-dir-for, STATIC_LIBRARIES, libvpx_asm_offsets_vp8)/libvpx_asm_offsets_vp8.a',
+          }],
+          ['(target_arch=="arm" or target_arch=="armv7")', {
+            'output_format': 'gas',
+          }, {
+            'output_format': 'rvds',
           }],
         ],
       },
       'conditions': [
         ['OS=="win"', {
           'variables': {
             'ninja_obj_dir': '<(PRODUCT_DIR)/obj/third_party/libvpx/<(libvpx_source)/vp8',
           },
           'actions': [
             {
               'action_name': 'copy_enc_offsets_obj',
               'inputs': [ 'copy_obj.py' ],
               'outputs': [ '<(INTERMEDIATE_DIR)/vp8_asm_enc_offsets.obj' ],
               'action': [
                 'python',
                 '<(DEPTH)/third_party/libvpx/copy_obj.py',
                 '-d', '<@(_outputs)',
                 '-s', '<(PRODUCT_DIR)/obj/libvpx_asm_offsets_vp8/vp8_asm_enc_offsets.obj',
                 '-s', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
                 '-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vp8/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
               ],
               'process_output_as_sources': 1,
             },
           ],
           'sources': [
             '<(INTERMEDIATE_DIR)/vp8_asm_enc_offsets.obj',
           ],
         }, {
-          'actions': [
-            {
-              # Take archived .a file and unpack it unto .o files.
-              'action_name': 'unpack_lib_posix',
-              'inputs': [
-                'unpack_lib_posix.sh',
-              ],
-              'outputs': [
-                '<(INTERMEDIATE_DIR)/vp8_asm_enc_offsets.o',
-              ],
-              'action': [
-                '<(DEPTH)/third_party/libvpx/unpack_lib_posix.sh',
-                '-d', '<(INTERMEDIATE_DIR)',
-                '-a', '<(PRODUCT_DIR)/libvpx_asm_offsets_vp8.a',
-                '-a', '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vp8.a',
-                '-a', '<(LIB_DIR)/Source/WebKit/chromium/third_party/libvpx/libvpx_asm_offsets_vp8.a',
-                '-a', '<(lib_intermediate_path)',
-                '-f', 'vp8_asm_enc_offsets.o',
-              ],
-              'process_output_as_sources': 1,
-            },
-          ],
+          'variables': {
+            'unpack_lib_search_path_list': [
+              '-a', '<(PRODUCT_DIR)/libvpx_asm_offsets_vp8.a',
+              '-a', '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vp8.a',
+              '-a', '<(LIB_DIR)/Source/WebKit/chromium/third_party/libvpx/libvpx_asm_offsets_vp8.a',
+              '-a', '<(lib_intermediate_name)',
+            ],
+            'unpack_lib_output_dir':'<(INTERMEDIATE_DIR)',
+            'unpack_lib_name':'vp8_asm_enc_offsets.o'
+          },
+          'includes': ['unpack_lib_posix.gypi'],
           # Need this otherwise gyp won't run the rule on them.
           'sources': [
             '<(INTERMEDIATE_DIR)/vp8_asm_enc_offsets.o',
           ],
         }],
       ],
-      'rules': [
-        {
-          # Rule to extract integer values for each symbol from an object file.
-          'rule_name': 'obj_int_extract',
-          'extension': '<(asm_obj_extension)',
-          'inputs': [
-            '<(PRODUCT_DIR)/libvpx_obj_int_extract',
-            'obj_int_extract.py',
-          ],
-          'outputs': [
-            '<(shared_generated_dir)/<(RULE_INPUT_ROOT).asm',
-          ],
-          'variables': {
-            'conditions': [
-              ['(target_arch=="arm" or target_arch=="armv7")', {
-                'asm_format': 'gas',
-              }, {
-                'asm_format': 'rvds',
-              }],
-            ],
-          },
-          'action': [
-            'python',
-            '<(DEPTH)/third_party/libvpx/obj_int_extract.py',
-            '-e', '<(PRODUCT_DIR)/libvpx_obj_int_extract',
-            '-f', '<(asm_format)',
-            '-b', '<(RULE_INPUT_PATH)',
-            '-o', '<(shared_generated_dir)/<(RULE_INPUT_ROOT).asm',
-          ],
-          'message': 'Generate assembly offsets <(RULE_INPUT_PATH)',
-        },
-      ],
+      'includes': ['obj_int_extract.gypi'],
     },
     {
       # A target that takes assembly offsets library and generate the
       # corresponding assembly files.
       # This target is a hard dependency because the generated .asm files
       # are needed all assembly optimized files in libvpx.
       'target_name': 'gen_asm_offsets_vpx_scale',
       'type': 'none',
       'hard_dependency': 1,
       'dependencies': [
         'libvpx_asm_offsets_vpx_scale',
         'libvpx_obj_int_extract#host',
       ],
       'variables' : {
-        'lib_intermediate_path' : '',
+        'lib_intermediate_name' : '',
+        'output_format':'',
+        'output_dir': '<(shared_generated_dir)',
         'conditions' : [
           ['android_webview_build==1', {
-            'lib_intermediate_path' : '<(android_src)/$(call intermediates-dir-for, STATIC_LIBRARIES, libvpx_asm_offsets_vpx_scale)/libvpx_asm_offsets_vpx_scale.a',
+            'lib_intermediate_name' : '<(android_src)/$(call intermediates-dir-for, STATIC_LIBRARIES, libvpx_asm_offsets_vpx_scale)/libvpx_asm_offsets_vpx_scale.a',
+          }],
+          ['(target_arch=="arm" or target_arch=="armv7")', {
+            'output_format': 'gas',
+          }, {
+            'output_format': 'rvds',
           }],
         ],
       },
       'conditions': [
         ['OS=="win"', {
           'variables': {
             'ninja_obj_dir': '<(PRODUCT_DIR)/obj/third_party/libvpx/<(libvpx_source)/vpx_scale',
           },
           'actions': [
             {
               'action_name': 'copy_enc_offsets_obj',
               'inputs': [ 'copy_obj.py' ],
               'outputs': [ '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.obj' ],
               'action': [
                 'python',
                 '<(DEPTH)/third_party/libvpx/copy_obj.py',
                 '-d', '<@(_outputs)',
                 '-s', '<(PRODUCT_DIR)/obj/libvpx_asm_offsets_vpx_scale/vpx_scale_asm_offsets.obj',
                 '-s', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj',
                 '-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vpx_scale/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj',
               ],
               'process_output_as_sources': 1,
             },
           ],
           'sources': [
             '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.obj',
           ],
         }, {
-          'actions': [
-            {
-              # Take archived .a file and unpack it unto .o files.
-              'action_name': 'unpack_lib_posix',
-              'inputs': [
-                'unpack_lib_posix.sh',
-              ],
-              'outputs': [
-                '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.o',
-              ],
-              'action': [
-                '<(DEPTH)/third_party/libvpx/unpack_lib_posix.sh',
-                '-d', '<(INTERMEDIATE_DIR)',
-                '-a', '<(PRODUCT_DIR)/libvpx_asm_offsets_vpx_scale.a',
-                '-a', '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vpx_scale.a',
-                '-a', '<(LIB_DIR)/Source/WebKit/chromium/third_party/libvpx/libvpx_asm_offsets_vpx_scale.a',
-                '-a', '<(lib_intermediate_path)',
-                '-f', 'vpx_scale_asm_offsets.o',
-              ],
-              'process_output_as_sources': 1,
-            },
-          ],
-          # Need this otherwise gyp won't run the rule on them.
+          'variables': {
+            'unpack_lib_search_path_list': [
+              '-a', '<(PRODUCT_DIR)/libvpx_asm_offsets_vpx_scale.a',
+              '-a', '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vpx_scale.a',
+              '-a', '<(LIB_DIR)/Source/WebKit/chromium/third_party/libvpx/libvpx_asm_offsets_vpx_scale.a',
+              '-a', '<(lib_intermediate_name)',
+            ],
+            'unpack_lib_output_dir':'<(INTERMEDIATE_DIR)',
+            'unpack_lib_name':'vpx_scale_asm_offsets.o'
+          },
+          'includes': ['unpack_lib_posix.gypi'],
+         # Need this otherwise gyp won't run the rule on them.
           'sources': [
             '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.o',

[Johann, 2014/01/27 23:19:58]

Is there a way to mark this file as dirty whenever the source or configuration
change? It's unrelated to your change, but we've had issues with stale files
causing issues.

[michaelbai, 2014/01/27 23:55:21]

Which files or configuration changed?


On 2014/01/27 23:19:58, Johann wrote:

[Johann, 2014/01/28 00:03:57]

Any of the sources for libvpx_asm_offsets_*:
<(libvpx_source)/vp8/encoder/vp8_asm_enc_offsets.c
<(libvpx_source)/vpx_scale/vpx_scale_asm_offsets.c

or any configuration change where structure sizes could change - In one case,
the Debug directory will retain artifacts when switching between 32 and 64 bit
builds: b/12230993 This wasn't an issue for the Release directories because they
were different for 32 and 64 bit.

[michaelbai, 2014/01/28 00:15:39]

You may put a list of potential .a files as 'input' of action.


On 2014/01/28 00:03:57, Johann wrote:

           ],
         }],
       ],
-      'rules': [
-        {
-          # Rule to extract integer values for each symbol from an object file.
-          'rule_name': 'obj_int_extract',
-          'extension': '<(asm_obj_extension)',
-          'inputs': [
-            '<(PRODUCT_DIR)/libvpx_obj_int_extract',
-            'obj_int_extract.py',
-          ],
-          'outputs': [
-            '<(shared_generated_dir)/<(RULE_INPUT_ROOT).asm',
-          ],
-          'variables': {
-            'conditions': [
-              ['(target_arch=="arm" or target_arch=="armv7")', {
-                'asm_format': 'gas',
-              }, {
-                'asm_format': 'rvds',
-              }],
-            ],
-          },
-          'action': [
-            'python',
-            '<(DEPTH)/third_party/libvpx/obj_int_extract.py',
-            '-e', '<(PRODUCT_DIR)/libvpx_obj_int_extract',
-            '-f', '<(asm_format)',
-            '-b', '<(RULE_INPUT_PATH)',
-            '-o', '<(shared_generated_dir)/<(RULE_INPUT_ROOT).asm',
-          ],
-          'message': 'Generate assembly offsets <(RULE_INPUT_PATH)',
-        },
-      ],
+      'includes': ['obj_int_extract.gypi'],
     },
     {
       'target_name': 'simple_encoder',
       'type': 'executable',
       'dependencies': [
         'libvpx',
       ],
 
       # Copy the script to the output folder so that we can use it with
       # absolute path.
@@ skipping 59 matching lines @@
           'process_outputs_as_sources': 1,
           'message': 'Generate libvpx example code <(RULE_INPUT_PATH)',
         },
       ],
       'sources': [
         '<(libvpx_source)/examples/simple_decoder.txt',
       ]
     },
   ],
 }