diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-06 15:56:08 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-06 15:56:08 +0000 |
| commit | 1a248ac7c3bc0f014a284a2eeddf9a9295d2f4aa (patch) | |
| tree | 215b83063b1f890e18626c8cf7451141128f0a79 /libvpx_obj_int_extract.host.linux-x86.mk | |
| parent | 2c7555d9cd195ea90818937cafab0784db337694 (diff) | |
| download | libvpx-1a248ac7c3bc0f014a284a2eeddf9a9295d2f4aa.tar.gz | |
Update makefiles after merge of Chromium at 275449
This commit was generated by merge_from_chromium.py.
Change-Id: I7d0b0293aa3dab0b53ff698ecf4950a828ac3747
Diffstat (limited to 'libvpx_obj_int_extract.host.linux-x86.mk')
| -rw-r--r-- | libvpx_obj_int_extract.host.linux-x86.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libvpx_obj_int_extract.host.linux-x86.mk b/libvpx_obj_int_extract.host.linux-x86.mk index eee223c..3559aae 100644 --- a/libvpx_obj_int_extract.host.linux-x86.mk +++ b/libvpx_obj_int_extract.host.linux-x86.mk @@ -8,7 +8,8 @@ LOCAL_MODULE_STEM := libvpx_obj_int_extract LOCAL_MODULE_SUFFIX := LOCAL_MODULE_TAGS := optional LOCAL_IS_HOST_MODULE := true -gyp_intermediate_dir := $(call local-intermediates-dir) +LOCAL_MULTILIB := $(GYP_HOST_MULTILIB) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. |