diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-07 23:38:59 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-07 23:38:59 +0000 |
| commit | 2088d2cb6f763d8b9e58d34b5b23789b037d282a (patch) | |
| tree | a4415dc8570c0528d70537b4c65dc19a1cfbfc32 /gen_asm_offsets_vp8.target.darwin-x86.mk | |
| parent | 40b43a6ae06ff1c35ec6252aa88bfecfcb71a0ee (diff) | |
| download | libvpx-2088d2cb6f763d8b9e58d34b5b23789b037d282a.tar.gz | |
Update makefiles after merge of Chromium at 262249
This commit was generated by merge_from_chromium.py.
Change-Id: Ib169cc37d007ecfe1f78fb8b8d5b4d33c422c40e
Diffstat (limited to 'gen_asm_offsets_vp8.target.darwin-x86.mk')
| -rw-r--r-- | gen_asm_offsets_vp8.target.darwin-x86.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gen_asm_offsets_vp8.target.darwin-x86.mk b/gen_asm_offsets_vp8.target.darwin-x86.mk index dafb5a7..a6b3c3f 100644 --- a/gen_asm_offsets_vp8.target.darwin-x86.mk +++ b/gen_asm_offsets_vp8.target.darwin-x86.mk @@ -22,7 +22,7 @@ $(gyp_intermediate_dir)/vp8_asm_enc_offsets.o: gyp_shared_intermediate_dir := $( $(gyp_intermediate_dir)/vp8_asm_enc_offsets.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) $(gyp_intermediate_dir)/vp8_asm_enc_offsets.o: $(LOCAL_PATH)/third_party/libvpx/unpack_lib_posix.sh $(GYP_TARGET_DEPENDENCIES) @echo "Gyp action: third_party_libvpx_libvpx_gyp_gen_asm_offsets_vp8_target_unpack_lib_posix ($@)" - $(hide)cd $(gyp_local_path)/third_party/libvpx; mkdir -p $(gyp_intermediate_dir); ../../third_party/libvpx/unpack_lib_posix.sh -d "$(gyp_intermediate_dir)" -f vp8_asm_enc_offsets.o -a "$(gyp_shared_intermediate_dir)/libvpx_asm_offsets_vp8.a" -a "$(obj).$(TOOLSET)/third_party/libvpx/libvpx_asm_offsets_vp8.a" -a "$(obj).$(TOOLSET)/Source/WebKit/chromium/third_party/libvpx/libvpx_asm_offsets_vp8.a" -a "$(PWD)/$(call intermediates-dir-for, STATIC_LIBRARIES, libvpx_asm_offsets_vp8)/libvpx_asm_offsets_vp8.a" -r "$(PWD)/$(TARGET_AR)" + $(hide)cd $(gyp_local_path)/third_party/libvpx; mkdir -p $(gyp_intermediate_dir); ../../third_party/libvpx/unpack_lib_posix.sh -d "$(gyp_intermediate_dir)" -f vp8_asm_enc_offsets.o -a "$(gyp_shared_intermediate_dir)/libvpx_asm_offsets_vp8.a" -a "$(obj).$(TOOLSET)/third_party/libvpx/libvpx_asm_offsets_vp8.a" -a "$(obj).$(TOOLSET)/Source/WebKit/chromium/third_party/libvpx/libvpx_asm_offsets_vp8.a" -a "$(PWD)/$(call intermediates-dir-for, STATIC_LIBRARIES, libvpx_asm_offsets_vp8,,, $(GYP_VAR_PREFIX))/libvpx_asm_offsets_vp8.a" -r "$(PWD)/$($(GYP_VAR_PREFIX)TARGET_AR)" |