commit c71dd0dcd9ff4ccf721127f79fd9a41cee6b13ce
author Android Chromium Automerger <chromium-automerger@android> Wed Apr 09 18:59:40 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Wed Apr 09 18:59:40 2014 +0000
tree ba376e96ec095d59973939752e68dd4bbd3f26ef
parent ab63ca0e261973e04f36ea69d7d4f4712db33b7b

Update makefiles after merge of Chromium at 262754

This commit was generated by merge_from_chromium.py.

Change-Id: I354903dccf62f6b7d2bc87116fb6b5a126fe7613

modules/iSACFix.target.darwin-arm.mk

diff --git a/modules/iSACFix.target.darwin-arm.mk b/modules/iSACFix.target.darwin-arm.mk
index 144f54e..13f44db 100644
--- a/modules/iSACFix.target.darwin-arm.mk
+++ b/modules/iSACFix.target.darwin-arm.mk
@@ -6,8 +6,9 @@
 LOCAL_MODULE := third_party_webrtc_modules_iSACFix_gyp
 LOCAL_MODULE_SUFFIX := .a
 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 :=