From 8f2a7fafe87564dceb5db0a03326036e5022ee13 Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Tue, 4 Nov 2014 16:56:55 +0000 Subject: Update makefiles after merge of Chromium at a99b7ad25d02 This commit was generated by merge_from_chromium.py. Change-Id: I172fda810eb6cb37d17ba35571733f9eaeb9b230 --- video_engine/video_engine_core.target.darwin-arm.mk | 2 ++ video_engine/video_engine_core.target.darwin-arm64.mk | 2 ++ video_engine/video_engine_core.target.darwin-mips.mk | 2 ++ video_engine/video_engine_core.target.darwin-x86.mk | 2 ++ video_engine/video_engine_core.target.darwin-x86_64.mk | 2 ++ video_engine/video_engine_core.target.linux-arm.mk | 2 ++ video_engine/video_engine_core.target.linux-arm64.mk | 2 ++ video_engine/video_engine_core.target.linux-mips.mk | 2 ++ video_engine/video_engine_core.target.linux-x86.mk | 2 ++ video_engine/video_engine_core.target.linux-x86_64.mk | 2 ++ 10 files changed, 20 insertions(+) (limited to 'video_engine') diff --git a/video_engine/video_engine_core.target.darwin-arm.mk b/video_engine/video_engine_core.target.darwin-arm.mk index aefd2da4..8d641ade 100644 --- a/video_engine/video_engine_core.target.darwin-arm.mk +++ b/video_engine/video_engine_core.target.darwin-arm.mk @@ -133,6 +133,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -249,6 +250,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/video_engine/video_engine_core.target.darwin-arm64.mk b/video_engine/video_engine_core.target.darwin-arm64.mk index d839ed91..1943575a 100644 --- a/video_engine/video_engine_core.target.darwin-arm64.mk +++ b/video_engine/video_engine_core.target.darwin-arm64.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -222,6 +223,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/video_engine/video_engine_core.target.darwin-mips.mk b/video_engine/video_engine_core.target.darwin-mips.mk index 34ca802e..d08ebe28 100644 --- a/video_engine/video_engine_core.target.darwin-mips.mk +++ b/video_engine/video_engine_core.target.darwin-mips.mk @@ -125,6 +125,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -233,6 +234,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/video_engine/video_engine_core.target.darwin-x86.mk b/video_engine/video_engine_core.target.darwin-x86.mk index 990906fa..ef6f589b 100644 --- a/video_engine/video_engine_core.target.darwin-x86.mk +++ b/video_engine/video_engine_core.target.darwin-x86.mk @@ -125,6 +125,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -232,6 +233,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/video_engine/video_engine_core.target.darwin-x86_64.mk b/video_engine/video_engine_core.target.darwin-x86_64.mk index 25773e72..e0eba775 100644 --- a/video_engine/video_engine_core.target.darwin-x86_64.mk +++ b/video_engine/video_engine_core.target.darwin-x86_64.mk @@ -124,6 +124,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -230,6 +231,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/video_engine/video_engine_core.target.linux-arm.mk b/video_engine/video_engine_core.target.linux-arm.mk index aefd2da4..8d641ade 100644 --- a/video_engine/video_engine_core.target.linux-arm.mk +++ b/video_engine/video_engine_core.target.linux-arm.mk @@ -133,6 +133,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -249,6 +250,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/video_engine/video_engine_core.target.linux-arm64.mk b/video_engine/video_engine_core.target.linux-arm64.mk index d839ed91..1943575a 100644 --- a/video_engine/video_engine_core.target.linux-arm64.mk +++ b/video_engine/video_engine_core.target.linux-arm64.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -222,6 +223,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/video_engine/video_engine_core.target.linux-mips.mk b/video_engine/video_engine_core.target.linux-mips.mk index 34ca802e..d08ebe28 100644 --- a/video_engine/video_engine_core.target.linux-mips.mk +++ b/video_engine/video_engine_core.target.linux-mips.mk @@ -125,6 +125,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -233,6 +234,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/video_engine/video_engine_core.target.linux-x86.mk b/video_engine/video_engine_core.target.linux-x86.mk index 990906fa..ef6f589b 100644 --- a/video_engine/video_engine_core.target.linux-x86.mk +++ b/video_engine/video_engine_core.target.linux-x86.mk @@ -125,6 +125,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -232,6 +233,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/video_engine/video_engine_core.target.linux-x86_64.mk b/video_engine/video_engine_core.target.linux-x86_64.mk index 25773e72..e0eba775 100644 --- a/video_engine/video_engine_core.target.linux-x86_64.mk +++ b/video_engine/video_engine_core.target.linux-x86_64.mk @@ -124,6 +124,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -230,6 +231,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ -- cgit v1.2.3