diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-03-11 21:42:57 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-03-11 21:42:57 +0000 |
| commit | f73a18d86a5e341607cbd1e6027cce1ac24fa395 (patch) | |
| tree | 251130bc4a3de969e269e1d2f7163af4573585e6 /system_wrappers | |
| parent | fb93ba1b488389a6fdece8c967fcd96799ef3d40 (diff) | |
| download | webrtc-f73a18d86a5e341607cbd1e6027cce1ac24fa395.tar.gz | |
Update makefiles after merge of Chromium at 256314
This commit was generated by merge_from_chromium.py.
Change-Id: Ifaf1a7c7c676d42d98778063bf58aed8a3988417
Diffstat (limited to 'system_wrappers')
12 files changed, 24 insertions, 0 deletions
diff --git a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk b/system_wrappers/source/cpu_features_android.target.darwin-arm.mk index b1b45a40..50265677 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-arm.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ @@ -188,6 +189,7 @@ MY_DEFS_Release := \ '-DWEBRTC_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ diff --git a/system_wrappers/source/cpu_features_android.target.darwin-mips.mk b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk index 92eb39e4..37ef2b5d 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-mips.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk @@ -88,6 +88,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_CHROMIUM_BUILD' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ @@ -186,6 +187,7 @@ MY_DEFS_Release := \ '-DWEBRTC_CHROMIUM_BUILD' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ diff --git a/system_wrappers/source/cpu_features_android.target.darwin-x86.mk b/system_wrappers/source/cpu_features_android.target.darwin-x86.mk index 242446f9..9e3d5778 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-x86.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-x86.mk @@ -88,6 +88,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ @@ -185,6 +186,7 @@ MY_DEFS_Release := \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm.mk b/system_wrappers/source/cpu_features_android.target.linux-arm.mk index b1b45a40..50265677 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ @@ -188,6 +189,7 @@ MY_DEFS_Release := \ '-DWEBRTC_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ diff --git a/system_wrappers/source/cpu_features_android.target.linux-mips.mk b/system_wrappers/source/cpu_features_android.target.linux-mips.mk index 92eb39e4..37ef2b5d 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-mips.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-mips.mk @@ -88,6 +88,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_CHROMIUM_BUILD' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ @@ -186,6 +187,7 @@ MY_DEFS_Release := \ '-DWEBRTC_CHROMIUM_BUILD' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ diff --git a/system_wrappers/source/cpu_features_android.target.linux-x86.mk b/system_wrappers/source/cpu_features_android.target.linux-x86.mk index 242446f9..9e3d5778 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-x86.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-x86.mk @@ -88,6 +88,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ @@ -185,6 +186,7 @@ MY_DEFS_Release := \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-arm.mk b/system_wrappers/source/system_wrappers.target.darwin-arm.mk index 48f2aa77..59559f7a 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-arm.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-arm.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ @@ -219,6 +220,7 @@ MY_DEFS_Release := \ '-DWEBRTC_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-mips.mk b/system_wrappers/source/system_wrappers.target.darwin-mips.mk index 55d4ffaf..76fee86f 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-mips.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-mips.mk @@ -115,6 +115,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_CHROMIUM_BUILD' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ @@ -217,6 +218,7 @@ MY_DEFS_Release := \ '-DWEBRTC_CHROMIUM_BUILD' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-x86.mk b/system_wrappers/source/system_wrappers.target.darwin-x86.mk index 03414061..86014e86 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-x86.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-x86.mk @@ -115,6 +115,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ @@ -216,6 +217,7 @@ MY_DEFS_Release := \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ diff --git a/system_wrappers/source/system_wrappers.target.linux-arm.mk b/system_wrappers/source/system_wrappers.target.linux-arm.mk index 48f2aa77..59559f7a 100644 --- a/system_wrappers/source/system_wrappers.target.linux-arm.mk +++ b/system_wrappers/source/system_wrappers.target.linux-arm.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ @@ -219,6 +220,7 @@ MY_DEFS_Release := \ '-DWEBRTC_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ diff --git a/system_wrappers/source/system_wrappers.target.linux-mips.mk b/system_wrappers/source/system_wrappers.target.linux-mips.mk index 55d4ffaf..76fee86f 100644 --- a/system_wrappers/source/system_wrappers.target.linux-mips.mk +++ b/system_wrappers/source/system_wrappers.target.linux-mips.mk @@ -115,6 +115,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_CHROMIUM_BUILD' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ @@ -217,6 +218,7 @@ MY_DEFS_Release := \ '-DWEBRTC_CHROMIUM_BUILD' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ diff --git a/system_wrappers/source/system_wrappers.target.linux-x86.mk b/system_wrappers/source/system_wrappers.target.linux-x86.mk index 03414061..86014e86 100644 --- a/system_wrappers/source/system_wrappers.target.linux-x86.mk +++ b/system_wrappers/source/system_wrappers.target.linux-x86.mk @@ -115,6 +115,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ @@ -216,6 +217,7 @@ MY_DEFS_Release := \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ + '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ |