From a8cd12922613877bc21c72bd0b3de1542db411d8 Mon Sep 17 00:00:00 2001 From: Dan Minor Date: Tue, 11 Feb 2020 17:06:09 +0000 Subject: [PATCH] Bug 1578073 - Update generated video capture moz.build file; r=ng Differential Revision: https://phabricator.services.mozilla.com/D61856 --HG-- extra : moz-landing-system : lando --- .../video_capture_internal_impl_gn/moz.build | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build b/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build index 806bae05b4ce..140f6f1a1c73 100644 --- a/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build +++ b/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build @@ -37,36 +37,6 @@ if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" DEFINES["WTF_USE_DYNAMIC_ANNOTATIONS"] = "1" -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True - DEFINES["ANDROID_NDK_VERSION"] = "r12b" - DEFINES["DISABLE_NACL"] = True - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["NO_TCMALLOC"] = True - DEFINES["USE_OPENSSL_CERTS"] = "1" - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["__GNU_SOURCE"] = "1" - - LOCAL_INCLUDES += [ - "/config/external/nspr/", - "/nsprpub/lib/ds/", - "/nsprpub/pr/include/" - ] - - OS_LIBS += [ - "log" - ] - - UNIFIED_SOURCES += [ - "/media/webrtc/trunk/webrtc/modules/video_capture/android/device_info_android.cc", - "/media/webrtc/trunk/webrtc/modules/video_capture/android/video_capture_android.cc" - ] - if CONFIG["OS_TARGET"] == "Darwin": DEFINES["CR_XCODE_VERSION"] = "0920"