diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-10 11:22:14 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-10 11:22:14 +0100 |
| commit | c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c (patch) | |
| tree | e9edd581ad60ab80aa5ab423a2a80df652a75792 /third_party/expat/expat.target.darwin-x86_64.mk | |
| parent | 54cd42278ccf1d52996034848086a09b23065a40 (diff) | |
| download | chromium_org-c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c.tar.gz | |
Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
Diffstat (limited to 'third_party/expat/expat.target.darwin-x86_64.mk')
| -rw-r--r-- | third_party/expat/expat.target.darwin-x86_64.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/third_party/expat/expat.target.darwin-x86_64.mk b/third_party/expat/expat.target.darwin-x86_64.mk index bbdfeb9a24..5289f83625 100644 --- a/third_party/expat/expat.target.darwin-x86_64.mk +++ b/third_party/expat/expat.target.darwin-x86_64.mk @@ -7,8 +7,9 @@ LOCAL_MODULE := third_party_expat_expat_gyp LOCAL_MODULE_STEM := expat LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional -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 := @@ -29,6 +30,7 @@ expat: third_party_expat_expat_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 @@ -36,3 +38,5 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(hide) echo "Gyp timestamp: $@" $(hide) mkdir -p $(dir $@) $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := |