From 1f1f341e51252a00f1db27d561572739a7b33c38 Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Tue, 28 Oct 2014 17:51:39 +0000 Subject: 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 | 4 ++-- libsrtp.target.linux-mips.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 @@ MY_DEFS_Debug := \ '-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 @@ MY_DEFS_Release := \ '-DHAVE_INTTYPES_H' \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ - '-DCPU_RISC' \ + '-DCPU_CISC' \ '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ 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 @@ MY_DEFS_Debug := \ '-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 @@ MY_DEFS_Release := \ '-DHAVE_INTTYPES_H' \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ - '-DCPU_RISC' \ + '-DCPU_CISC' \ '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ -- cgit v1.2.3