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_obj_int_extract.host.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_obj_int_extract.host.linux-x86.mk')
| -rw-r--r-- | libvpx_obj_int_extract.host.linux-x86.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libvpx_obj_int_extract.host.linux-x86.mk b/libvpx_obj_int_extract.host.linux-x86.mk index f104172..eb88c3b 100644 --- a/libvpx_obj_int_extract.host.linux-x86.mk +++ b/libvpx_obj_int_extract.host.linux-x86.mk @@ -3,13 +3,14 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE := third_party_libvpx_libvpx_obj_int_extract_host_gyp +LOCAL_MODULE := third_party_libvpx_libvpx_obj_int_extract_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp 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) -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 := @@ -182,11 +183,11 @@ LOCAL_SHARED_LIBRARIES := # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_libvpx_libvpx_obj_int_extract_host_gyp +gyp_all_modules: third_party_libvpx_libvpx_obj_int_extract_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp # Alias gyp target name. .PHONY: libvpx_obj_int_extract -libvpx_obj_int_extract: third_party_libvpx_libvpx_obj_int_extract_host_gyp +libvpx_obj_int_extract: third_party_libvpx_libvpx_obj_int_extract_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp LOCAL_MODULE_PATH := $(gyp_shared_intermediate_dir) include $(BUILD_HOST_EXECUTABLE) |