From 83c1dcb463539082ad44dbe0fd6beffffdc96e3c Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Tue, 4 Nov 2014 15:28:01 +0000 Subject: Update makefiles after merge of Chromium at 30ec995cdb2d This commit was generated by merge_from_chromium.py. Change-Id: I77678e9f2e5044a6457f21cada6ee13b75fbfb0c --- voice_engine/voice_engine.target.darwin-arm64.mk | 2 ++ voice_engine/voice_engine.target.linux-arm64.mk | 2 ++ 2 files changed, 4 insertions(+) (limited to 'voice_engine') diff --git a/voice_engine/voice_engine.target.darwin-arm64.mk b/voice_engine/voice_engine.target.darwin-arm64.mk index 1246db1d..726068a4 100644 --- a/voice_engine/voice_engine.target.darwin-arm64.mk +++ b/voice_engine/voice_engine.target.darwin-arm64.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ '-DLOGGING_INSIDE_WEBRTC' \ + '-DWEBRTC_ARCH_ARM' \ '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ @@ -218,6 +219,7 @@ MY_DEFS_Release := \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ '-DLOGGING_INSIDE_WEBRTC' \ + '-DWEBRTC_ARCH_ARM' \ '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ diff --git a/voice_engine/voice_engine.target.linux-arm64.mk b/voice_engine/voice_engine.target.linux-arm64.mk index 1246db1d..726068a4 100644 --- a/voice_engine/voice_engine.target.linux-arm64.mk +++ b/voice_engine/voice_engine.target.linux-arm64.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ '-DLOGGING_INSIDE_WEBRTC' \ + '-DWEBRTC_ARCH_ARM' \ '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ @@ -218,6 +219,7 @@ MY_DEFS_Release := \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ '-DLOGGING_INSIDE_WEBRTC' \ + '-DWEBRTC_ARCH_ARM' \ '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ -- cgit v1.2.3