From 704191c91bbecdf628aa6a7b6c443234b984059f Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Tue, 4 Nov 2014 16:56:54 +0000 Subject: Update makefiles after merge of Chromium at a99b7ad25d02 This commit was generated by merge_from_chromium.py. Change-Id: I0bead36c8928faaddb9df8669c3fd7e3e3d2d7d9 --- libsrtp.target.darwin-arm.mk | 2 ++ libsrtp.target.darwin-arm64.mk | 2 ++ libsrtp.target.darwin-mips.mk | 2 ++ libsrtp.target.darwin-x86.mk | 2 ++ libsrtp.target.darwin-x86_64.mk | 2 ++ libsrtp.target.linux-arm.mk | 2 ++ libsrtp.target.linux-arm64.mk | 2 ++ libsrtp.target.linux-mips.mk | 2 ++ libsrtp.target.linux-x86.mk | 2 ++ libsrtp.target.linux-x86_64.mk | 2 ++ 10 files changed, 20 insertions(+) diff --git a/libsrtp.target.darwin-arm.mk b/libsrtp.target.darwin-arm.mk index 71ed337..7bca80d 100644 --- a/libsrtp.target.darwin-arm.mk +++ b/libsrtp.target.darwin-arm.mk @@ -128,6 +128,7 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -242,6 +243,7 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ diff --git a/libsrtp.target.darwin-arm64.mk b/libsrtp.target.darwin-arm64.mk index 48a008e..97831fc 100644 --- a/libsrtp.target.darwin-arm64.mk +++ b/libsrtp.target.darwin-arm64.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -217,6 +218,7 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ diff --git a/libsrtp.target.darwin-mips.mk b/libsrtp.target.darwin-mips.mk index 278921d..2115b8d 100644 --- a/libsrtp.target.darwin-mips.mk +++ b/libsrtp.target.darwin-mips.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -228,6 +229,7 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ diff --git a/libsrtp.target.darwin-x86.mk b/libsrtp.target.darwin-x86.mk index 130cda8..b21d091 100644 --- a/libsrtp.target.darwin-x86.mk +++ b/libsrtp.target.darwin-x86.mk @@ -123,6 +123,7 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -231,6 +232,7 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ diff --git a/libsrtp.target.darwin-x86_64.mk b/libsrtp.target.darwin-x86_64.mk index ab36a8a..7bd6140 100644 --- a/libsrtp.target.darwin-x86_64.mk +++ b/libsrtp.target.darwin-x86_64.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -227,6 +228,7 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ diff --git a/libsrtp.target.linux-arm.mk b/libsrtp.target.linux-arm.mk index 71ed337..7bca80d 100644 --- a/libsrtp.target.linux-arm.mk +++ b/libsrtp.target.linux-arm.mk @@ -128,6 +128,7 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -242,6 +243,7 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ diff --git a/libsrtp.target.linux-arm64.mk b/libsrtp.target.linux-arm64.mk index 48a008e..97831fc 100644 --- a/libsrtp.target.linux-arm64.mk +++ b/libsrtp.target.linux-arm64.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -217,6 +218,7 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ diff --git a/libsrtp.target.linux-mips.mk b/libsrtp.target.linux-mips.mk index 278921d..2115b8d 100644 --- a/libsrtp.target.linux-mips.mk +++ b/libsrtp.target.linux-mips.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -228,6 +229,7 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ diff --git a/libsrtp.target.linux-x86.mk b/libsrtp.target.linux-x86.mk index 130cda8..b21d091 100644 --- a/libsrtp.target.linux-x86.mk +++ b/libsrtp.target.linux-x86.mk @@ -123,6 +123,7 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -231,6 +232,7 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ diff --git a/libsrtp.target.linux-x86_64.mk b/libsrtp.target.linux-x86_64.mk index ab36a8a..7bd6140 100644 --- a/libsrtp.target.linux-x86_64.mk +++ b/libsrtp.target.linux-x86_64.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -227,6 +228,7 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ -- cgit v1.2.3