mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 21:05:36 +00:00
Bug 1480834 - 1. Add WebRTC config for x86_64 on Android; r=dminor
Add GN config files and updated moz.build files for building WebRTC on Android x86_64. Differential Revision: https://phabricator.services.mozilla.com/D4479
This commit is contained in:
parent
054f1436df
commit
1129b28317
7755
media/webrtc/gn-configs/x64_False_x64_android.json
Normal file
7755
media/webrtc/gn-configs/x64_False_x64_android.json
Normal file
File diff suppressed because it is too large
Load Diff
7599
media/webrtc/gn-configs/x64_True_x64_android.json
Normal file
7599
media/webrtc/gn-configs/x64_True_x64_android.json
Normal file
File diff suppressed because it is too large
Load Diff
@ -183,6 +183,14 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
|
||||
"/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
DIRS += [
|
||||
"/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn",
|
||||
"/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD":
|
||||
|
||||
DIRS += [
|
||||
|
@ -260,6 +260,14 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
|
||||
"/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
"/media/webrtc/trunk/webrtc/common_audio/signal_processing/complex_bit_reverse.c",
|
||||
"/media/webrtc/trunk/webrtc/common_audio/signal_processing/filter_ar_fast_q12.c",
|
||||
"/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD":
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
|
@ -43,11 +43,6 @@ if CONFIG["MOZ_DEBUG"] == "1":
|
||||
|
||||
if CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
CXXFLAGS += [
|
||||
"-msse2",
|
||||
"-msse2"
|
||||
]
|
||||
|
||||
DEFINES["ANDROID"] = True
|
||||
DEFINES["ANDROID_NDK_VERSION"] = "r12b"
|
||||
DEFINES["DISABLE_NACL"] = True
|
||||
@ -170,6 +165,19 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
|
||||
|
||||
DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
CXXFLAGS += [
|
||||
"-msse2",
|
||||
"-msse2"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
CXXFLAGS += [
|
||||
"-msse2"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
|
||||
|
||||
CXXFLAGS += [
|
||||
|
@ -235,6 +235,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD":
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
|
@ -223,6 +223,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD":
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
|
@ -273,6 +273,16 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
SOURCES += [
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c"
|
||||
]
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD":
|
||||
|
||||
SOURCES += [
|
||||
|
@ -314,6 +314,21 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
DEFINES["WEBRTC_CODEC_ISAC"] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
"/media/webrtc/trunk/",
|
||||
"/media/webrtc/trunk/",
|
||||
"/media/webrtc/trunk/",
|
||||
"/media/webrtc/trunk/",
|
||||
"/media/webrtc/trunk/",
|
||||
"/media/webrtc/trunk/",
|
||||
"/media/webrtc/trunk/",
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD":
|
||||
|
||||
DEFINES["WEBRTC_CODEC_ISAC"] = True
|
||||
|
@ -224,6 +224,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD":
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
|
@ -231,6 +231,13 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression.c",
|
||||
"/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
|
||||
|
||||
CFLAGS += [
|
||||
|
@ -273,6 +273,10 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
DEFINES["WEBRTC_NS_FLOAT"] = True
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
DEFINES["WEBRTC_NS_FLOAT"] = True
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
|
||||
|
||||
CXXFLAGS += [
|
||||
|
@ -44,11 +44,6 @@ if CONFIG["MOZ_DEBUG"] == "1":
|
||||
|
||||
if CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
CXXFLAGS += [
|
||||
"-msse2",
|
||||
"-msse2"
|
||||
]
|
||||
|
||||
DEFINES["ANDROID"] = True
|
||||
DEFINES["ANDROID_NDK_VERSION"] = "r12b"
|
||||
DEFINES["DISABLE_NACL"] = True
|
||||
@ -171,6 +166,19 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
|
||||
|
||||
DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
CXXFLAGS += [
|
||||
"-msse2",
|
||||
"-msse2"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
CXXFLAGS += [
|
||||
"-msse2"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
|
||||
|
||||
CXXFLAGS += [
|
||||
|
@ -42,11 +42,6 @@ if CONFIG["MOZ_DEBUG"] == "1":
|
||||
|
||||
if CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
CXXFLAGS += [
|
||||
"-msse2",
|
||||
"-msse2"
|
||||
]
|
||||
|
||||
DEFINES["ANDROID"] = True
|
||||
DEFINES["ANDROID_NDK_VERSION"] = "r12b"
|
||||
DEFINES["DISABLE_NACL"] = True
|
||||
@ -181,6 +176,19 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
|
||||
|
||||
DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
CXXFLAGS += [
|
||||
"-msse2",
|
||||
"-msse2"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
|
||||
|
||||
CXXFLAGS += [
|
||||
"-msse2"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
|
||||
|
||||
CXXFLAGS += [
|
||||
|
Loading…
Reference in New Issue
Block a user