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 /libvpx_intrinsics_sse2.target.linux-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 'libvpx_intrinsics_sse2.target.linux-x86.mk')
| -rw-r--r-- | libvpx_intrinsics_sse2.target.linux-x86.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libvpx_intrinsics_sse2.target.linux-x86.mk b/libvpx_intrinsics_sse2.target.linux-x86.mk index 176bca9..0c8f9d5 100644 --- a/libvpx_intrinsics_sse2.target.linux-x86.mk +++ b/libvpx_intrinsics_sse2.target.linux-x86.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_sse2_gyp LOCAL_MODULE_SUFFIX := .a 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 := |