diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-05 09:42:12 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-05 09:42:12 +0000 |
commit | 27acdaafbba91998ea89d2a603b5e3381c7cb90d (patch) | |
tree | 49051df5a94ffc0ffd61b9b17e4d7add3bf0c9f9 /libvpx_obj_int_extract.host.linux-x86.mk | |
parent | d48d1aad0b5b8775fc2ba2020493a6e6b155987e (diff) | |
download | libvpx-27acdaafbba91998ea89d2a603b5e3381c7cb90d.tar.gz |
Update makefiles after merge of Chromium at 268152
This commit was generated by merge_from_chromium.py.
Change-Id: I6914dd5c3e4659eaceb3c5002d1d92bb1f5bf434
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, 1 insertions, 2 deletions
diff --git a/libvpx_obj_int_extract.host.linux-x86.mk b/libvpx_obj_int_extract.host.linux-x86.mk index eb88c3b..839522a 100644 --- a/libvpx_obj_int_extract.host.linux-x86.mk +++ b/libvpx_obj_int_extract.host.linux-x86.mk @@ -8,8 +8,7 @@ LOCAL_MODULE_STEM := libvpx_obj_int_extract LOCAL_MODULE_SUFFIX := LOCAL_MODULE_TAGS := optional LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_intermediate_dir := $(call local-intermediates-dir) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. |