diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-10 11:22:39 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-10 11:22:39 +0100 |
| commit | a9984bf9ddc3cf73fdae3f29134a2bab379e7029 (patch) | |
| tree | 64beb56990a736ecdee359b34bbbe5c35c98470f /Source/config.target.darwin-x86.mk | |
| parent | 62da73c97b73427f2604ddb66ea735314d433920 (diff) | |
| download | WebKit-a9984bf9ddc3cf73fdae3f29134a2bab379e7029.tar.gz | |
Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I767658f35150c8e0099156a5a5daf4bdf7e8ae0f
Diffstat (limited to 'Source/config.target.darwin-x86.mk')
| -rw-r--r-- | Source/config.target.darwin-x86.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/config.target.darwin-x86.mk b/Source/config.target.darwin-x86.mk index d0db1afb3..366c8e7f8 100644 --- a/Source/config.target.darwin-x86.mk +++ b/Source/config.target.darwin-x86.mk @@ -7,8 +7,9 @@ LOCAL_MODULE := third_party_WebKit_Source_config_gyp LOCAL_MODULE_STEM := config 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 @@ config: third_party_WebKit_Source_config_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 := |