diff options
Diffstat (limited to 'third_party/yasm/config_sources.host.linux-x86.mk')
| -rw-r--r-- | third_party/yasm/config_sources.host.linux-x86.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/third_party/yasm/config_sources.host.linux-x86.mk b/third_party/yasm/config_sources.host.linux-x86.mk index 0a28957cc5..076a7d7450 100644 --- a/third_party/yasm/config_sources.host.linux-x86.mk +++ b/third_party/yasm/config_sources.host.linux-x86.mk @@ -3,13 +3,14 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := GYP -LOCAL_MODULE := third_party_yasm_config_sources_host_gyp +LOCAL_MODULE := third_party_yasm_config_sources_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp LOCAL_MODULE_STEM := config_sources LOCAL_MODULE_SUFFIX := .stamp 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 := @@ -147,14 +148,15 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_yasm_config_sources_host_gyp +gyp_all_modules: third_party_yasm_config_sources_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp # Alias gyp target name. .PHONY: config_sources -config_sources: third_party_yasm_config_sources_host_gyp +config_sources: third_party_yasm_config_sources_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_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 @@ -162,3 +164,5 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(hide) echo "Gyp timestamp: $@" $(hide) mkdir -p $(dir $@) $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := |