Revert 289715 "libvpx.gyp: Remove redundant sources."
Not so redundant:
{standard input}: Assembler messages:
{standard input}:27: Error: can't open vpx_scale_asm_offsets.asm for reading: No such file or directory
make: *** [out/target/product/generic/obj/STATIC_LIBRARIES/third_party_libvpx_libvpx_gyp_intermediates/vp8_vpxyv12_copyframe_func_neon.o] Error 1
make: *** Waiting for unfinished jobs....
{standard input}: Assembler messages:
{standard input}:27: Error: can't open vpx_scale_asm_offsets.asm for reading: No such file or directory
make: *** [out/target/product/generic/obj/STATIC_LIBRARIES/third_party_libvpx_libvpx_gyp_intermediates/vp8_vpxyv12_copysrcframe_func_neon.o] Error 1
{standard input}: Assembler messages:
{standard input}:27: Error: can't open vpx_scale_asm_offsets.asm for reading: No such file or directory
make: *** [out/target/product/generic/obj/STATIC_LIBRARIES/third_party_libvpx_libvpx_gyp_intermediates/vp8_vpxyv12_extendframeborders_neon.o] Error 1
In file included from external/chromium_org/third_party/libvpx/source/libvpx/vp8/common/arm/armv6/idct_blk_v6.c:11:0:
external/chromium_org/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_config.h:13:0: warning: "ARCH_ARM" redefined [enabled by default]
#define ARCH_ARM 1
^
In file included from <command-line>:0:0:
./build/core/combo/include/arch/linux-arm/AndroidConfig.h:254:0: note: this is the location of the previous definition
#define ARCH_ARM
^
In file included from external/chromium_org/third_party/libvpx/source/libvpx/vp8/common/alloccommon.c:12:0:
external/chromium_org/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_config.h:13:0: warning: "ARCH_ARM" redefined [enabled by default]
#define ARCH_ARM 1
^
In file included from <command-line>:0:0:
./build/core/combo/include/arch/linux-arm/AndroidConfig.h:254:0: note: this is the location of the previous definition
#define ARCH_ARM
^
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: Some input files use unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
make: *** wait: No child processes. Stop.
On the AOSP builder we still can't find the scale offsets without the extra sources. Reverting for now.
> libvpx.gyp: Remove redundant sources.
>
> A typo that went unnoticed at the usage sites of process_outputs_as_sources
> (a missing 's' in outputs) resulted in the workaround of adding the output from
> the libvpx asm offsets step as an explicit source file.
>
> R=thakis@chromium.org
>
> Review URL: https://codereview.chromium.org/469363004
TBR=tomfinegan@google.com
Review URL: https://codereview.chromium.org/474153002
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@289815 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/libvpx.gyp b/libvpx.gyp
index 349a536..96a1296 100644
--- a/libvpx.gyp
+++ b/libvpx.gyp
@@ -478,6 +478,9 @@
'process_outputs_as_sources': 1,
},
],
+ 'sources': [
+ '<(INTERMEDIATE_DIR)/vp8_asm_enc_offsets.obj',
+ ],
}, {
'variables': {
'unpack_lib_search_path_list': [
@@ -549,6 +552,9 @@
'process_outputs_as_sources': 1,
},
],
+ 'sources': [
+ '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.obj',
+ ],
}, {
'variables': {
'unpack_lib_search_path_list': [
@@ -562,6 +568,10 @@
'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',
+ ],
}],
],
'includes': ['obj_int_extract.gypi'],
