diff options
Diffstat (limited to 'third_party/protobuf/protobuf_full_do_not_use.host.darwin-mips.mk')
| -rw-r--r-- | third_party/protobuf/protobuf_full_do_not_use.host.darwin-mips.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/third_party/protobuf/protobuf_full_do_not_use.host.darwin-mips.mk b/third_party/protobuf/protobuf_full_do_not_use.host.darwin-mips.mk index d2f4a03889..9c70f16716 100644 --- a/third_party/protobuf/protobuf_full_do_not_use.host.darwin-mips.mk +++ b/third_party/protobuf/protobuf_full_do_not_use.host.darwin-mips.mk @@ -3,12 +3,13 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_protobuf_protobuf_full_do_not_use_host_gyp +LOCAL_MODULE := third_party_protobuf_protobuf_full_do_not_use_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp LOCAL_MODULE_SUFFIX := .a 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 := @@ -211,10 +212,10 @@ LOCAL_SHARED_LIBRARIES := # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_protobuf_protobuf_full_do_not_use_host_gyp +gyp_all_modules: third_party_protobuf_protobuf_full_do_not_use_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp # Alias gyp target name. .PHONY: protobuf_full_do_not_use -protobuf_full_do_not_use: third_party_protobuf_protobuf_full_do_not_use_host_gyp +protobuf_full_do_not_use: third_party_protobuf_protobuf_full_do_not_use_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp include $(BUILD_HOST_STATIC_LIBRARY) |