Update makefiles after merge of Chromium at 262754
This commit was generated by merge_from_chromium.py.
Change-Id: Iabe15c53f65417c9b8a3360565f3b4ade7932acb
diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk
index 03c7de2..f9854fe 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -6,8 +6,9 @@
LOCAL_MODULE := third_party_ots_ots_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 :=