libvpx.gyp: Remove redundant sources.

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 454 matching lines @@
           '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',

[Nico, 2014/08/14 22:29:22]

Huh, what's this needed for? Why are there 3 paths in this action?
(<(INTERMEDIATE_DIR)/..., <(PRODUCT_DIR)/obj/..., and this one)

[Tom Finegan, 2014/08/14 22:47:35]

There have been problems with search paths on various chrome (specifically,
android webview and webrtc) builders due to differences in environment setup.
The extra paths are a workaround.

Here's a CL with the addition of a path that has some explanation about what's
going on (not exactly the same thing, but somewhat similar at least).

https://codereview.chromium.org/450993002/

Basically, it's more search paths because of different output locations on
various platforms.

                 '-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vp8/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
               ],
               'process_outputs_as_sources': 1,
             },
           ],
-          'sources': [
-            '<(INTERMEDIATE_DIR)/vp8_asm_enc_offsets.obj',
-          ],
         }, {
           '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)/chromium/src/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)',
@@ skipping 51 matching lines @@
                 '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_outputs_as_sources': 1,
             },
           ],
-          'sources': [
-            '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.obj',
-          ],
         }, {
           '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)/chromium/src/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',
-          ],

[Nico, 2014/08/14 22:29:22]

This branch doesn't have an action with process_outputs_as_sources, do you want
to remove this one too?

[Tom Finegan, 2014/08/14 22:47:35]

There's a process_outputs_as_sources from the inclusion of
unpack_lib_posix.gypi.

https://code.google.com/p/chromium/codesearch#chromium/src/third_party/libvpx...

[Nico, 2014/08/14 22:48:53]

Ah! lgtm

         }],
       ],
       'includes': ['obj_int_extract.gypi'],
     },
   ],
 }