From b0026218f7844a72aa79b919a723b124ae5a8d3b Mon Sep 17 00:00:00 2001
From: Android Chromium Automerger <chromium-automerger@android>
Date: Wed, 9 Apr 2014 18:59:35 +0000
Subject: Update makefiles after merge of Chromium at 262754

This commit was generated by merge_from_chromium.py.

Change-Id: Iac7170596bfdd7c552667d0fe1bbab498baabaf9
---
 ft2.target.darwin-x86.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ft2.target.darwin-x86.mk')

diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 68b5ad9..d079e99 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := third_party_freetype_ft2_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 :=
-- 
cgit v1.2.3