commit 4d67e08a7340edf22bce0f773736b3bcd835077c
author Android Chromium Automerger <chromium-automerger@android> Wed Apr 09 18:59:35 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Wed Apr 09 18:59:35 2014 +0000
tree 80311f3b8bfa375fce62228d0d16a362e01534ab
parent 8b7de122ca223c00fb935fbbee561eec2981eae3

Update makefiles after merge of Chromium at 262754

This commit was generated by merge_from_chromium.py.

Change-Id: Ib4d3c205fa37488fcc475aa3007cbaa2225a6ed9

libsrtp.target.linux-mips.mk

diff --git a/libsrtp.target.linux-mips.mk b/libsrtp.target.linux-mips.mk
index d3edfdb..8f55ee4 100644
--- a/libsrtp.target.linux-mips.mk
+++ b/libsrtp.target.linux-mips.mk
@@ -6,8 +6,9 @@
 LOCAL_MODULE := third_party_libsrtp_libsrtp_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 :=