diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-09 18:59:36 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-09 18:59:36 +0000 |
| commit | ac8a0ea174c9a9197c1ab8b5d57fcc0e5e0505b1 (patch) | |
| tree | c81ddc8e06349b44d7957d2dfe1e518a09456a57 /gen_asm_offsets_vp8.target.darwin-x86.mk | |
| parent | 2088d2cb6f763d8b9e58d34b5b23789b037d282a (diff) | |
| download | libvpx-ac8a0ea174c9a9197c1ab8b5d57fcc0e5e0505b1.tar.gz | |
Update makefiles after merge of Chromium at 262754
This commit was generated by merge_from_chromium.py.
Change-Id: Id53e9e2f8c62cd7ea775ecaf75dec93a57165b68
Diffstat (limited to 'gen_asm_offsets_vp8.target.darwin-x86.mk')
| -rw-r--r-- | gen_asm_offsets_vp8.target.darwin-x86.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gen_asm_offsets_vp8.target.darwin-x86.mk b/gen_asm_offsets_vp8.target.darwin-x86.mk index a6b3c3f..c1b3f11 100644 --- a/gen_asm_offsets_vp8.target.darwin-x86.mk +++ b/gen_asm_offsets_vp8.target.darwin-x86.mk @@ -7,12 +7,13 @@ LOCAL_MODULE := third_party_libvpx_gen_asm_offsets_vp8_gyp LOCAL_MODULE_STEM := gen_asm_offsets_vp8 LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8)/libvpx_asm_offsets_vp8.a \ + $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8,,,$(GYP_VAR_PREFIX))/libvpx_asm_offsets_vp8.a \ $(gyp_shared_intermediate_dir)/libvpx_obj_int_extract ### Rules for action "unpack_lib_posix": @@ -36,10 +37,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp8_asm_enc_offsets.asm: expor $(gyp_shared_intermediate_dir)/third_party/libvpx/vp8_asm_enc_offsets.asm: $(gyp_intermediate_dir)/vp8_asm_enc_offsets.o $(gyp_shared_intermediate_dir)/libvpx_obj_int_extract $(LOCAL_PATH)/third_party/libvpx/obj_int_extract.py $(GYP_TARGET_DEPENDENCIES) mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; python ../../third_party/libvpx/obj_int_extract.py -e "$(gyp_shared_intermediate_dir)/libvpx_obj_int_extract" -f rvds -b "$(gyp_intermediate_dir)/vp8_asm_enc_offsets.o" -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp8_asm_enc_offsets.asm" -.PHONY: third_party_libvpx_gen_asm_offsets_vp8_gyp_rule_trigger -third_party_libvpx_gen_asm_offsets_vp8_gyp_rule_trigger: $(gyp_shared_intermediate_dir)/third_party/libvpx/vp8_asm_enc_offsets.asm -### Finished generating for all rules GYP_GENERATED_OUTPUTS := \ $(gyp_intermediate_dir)/vp8_asm_enc_offsets.o \ @@ -48,8 +46,7 @@ GYP_GENERATED_OUTPUTS := \ # Make sure our deps and generated files are built first. LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) -LOCAL_GENERATED_SOURCES := \ - third_party_libvpx_gen_asm_offsets_vp8_gyp_rule_trigger +LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := @@ -243,6 +240,7 @@ gen_asm_offsets_vp8: third_party_libvpx_gen_asm_offsets_vp8_gyp LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) include $(BUILD_SYSTEM)/base_rules.mk @@ -250,3 +248,5 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(hide) echo "Gyp timestamp: $@" $(hide) mkdir -p $(dir $@) $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := |