commit 1f1f341e51252a00f1db27d561572739a7b33c38
author Android Chromium Automerger <chromium-automerger@android> Tue Oct 28 17:51:39 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Tue Oct 28 17:51:39 2014 +0000
tree 2c52eb8be62df0627053f19cbbf9357240b4296d
parent 9f462021782414bff7e31f0e08fab6c3cde70c8d

Update makefiles after merge of Chromium at d7fee8e7dd15

This commit was generated by merge_from_chromium.py.

Change-Id: I23f1c4e469e9a406880ff05cb3d03dd22a9b0dd3

libsrtp.target.darwin-mips.mk

diff --git a/libsrtp.target.darwin-mips.mk b/libsrtp.target.darwin-mips.mk
index 5ba57e9..a84c0eb 100644
--- a/libsrtp.target.darwin-mips.mk
+++ b/libsrtp.target.darwin-mips.mk
@@ -104,7 +104,7 @@
 	'-DHAVE_INTTYPES_H' \
 	'-DHAVE_NETINET_IN_H' \
 	'-DINLINE=inline' \
-	'-DCPU_RISC' \
+	'-DCPU_CISC' \
 	'-DFORCE_64BIT_ALIGN' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -209,7 +209,7 @@
 	'-DHAVE_INTTYPES_H' \
 	'-DHAVE_NETINET_IN_H' \
 	'-DINLINE=inline' \
-	'-DCPU_RISC' \
+	'-DCPU_CISC' \
 	'-DFORCE_64BIT_ALIGN' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \

libsrtp.target.linux-mips.mk

diff --git a/libsrtp.target.linux-mips.mk b/libsrtp.target.linux-mips.mk
index 5ba57e9..a84c0eb 100644
--- a/libsrtp.target.linux-mips.mk
+++ b/libsrtp.target.linux-mips.mk
@@ -104,7 +104,7 @@
 	'-DHAVE_INTTYPES_H' \
 	'-DHAVE_NETINET_IN_H' \
 	'-DINLINE=inline' \
-	'-DCPU_RISC' \
+	'-DCPU_CISC' \
 	'-DFORCE_64BIT_ALIGN' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -209,7 +209,7 @@
 	'-DHAVE_INTTYPES_H' \
 	'-DHAVE_NETINET_IN_H' \
 	'-DINLINE=inline' \
-	'-DCPU_RISC' \
+	'-DCPU_CISC' \
 	'-DFORCE_64BIT_ALIGN' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \