From 1124fb525bf7b8341170d886b8de070e20323efd Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 13 May 2018 22:46:04 +0200 Subject: Remove other gonk widget conditionals and unused files. Tag #288. --- media/libcubeb/src/moz.build | 21 +-- media/mtransport/common.build | 5 - media/mtransport/gonk_addrs.cpp | 170 --------------------- media/mtransport/test/moz.build | 2 +- media/omx-plugin/lib/ics/libstagefright/moz.build | 15 +- media/omx-plugin/lib/ics/libutils/moz.build | 7 +- .../lib/ics/libvideoeditorplayer/moz.build | 7 +- media/omx-plugin/moz.build | 33 ++-- media/webrtc/moz.build | 35 +++-- media/webrtc/signaling/test/moz.build | 2 +- 10 files changed, 45 insertions(+), 252 deletions(-) delete mode 100644 media/mtransport/gonk_addrs.cpp (limited to 'media') diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build index 781214620..2ca3a2f54 100644 --- a/media/libcubeb/src/moz.build +++ b/media/libcubeb/src/moz.build @@ -29,8 +29,6 @@ if CONFIG['MOZ_PULSEAUDIO']: 'cubeb_pulse.c', ] DEFINES['USE_PULSE'] = True - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - DEFINES['DISABLE_LIBPULSE_DLOPEN'] = True if CONFIG['MOZ_JACK']: SOURCES += [ @@ -73,24 +71,13 @@ if CONFIG['OS_TARGET'] == 'Android': SOURCES += ['cubeb_opensl.c'] SOURCES += ['cubeb_resampler.cpp'] DEFINES['USE_OPENSL'] = True - if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': - SOURCES += [ - 'cubeb_audiotrack.c', - ] - DEFINES['USE_AUDIOTRACK'] = True + SOURCES += [ + 'cubeb_audiotrack.c', + ] + DEFINES['USE_AUDIOTRACK'] = True FINAL_LIBRARY = 'gkmedias' -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - if CONFIG['ANDROID_VERSION'] >= '17': - LOCAL_INCLUDES += [ - '%' + '%s/frameworks/wilhelm/include' % CONFIG['ANDROID_SOURCE'], - ] - else: - LOCAL_INCLUDES += [ - '%' + '%s/system/media/wilhelm/include' % CONFIG['ANDROID_SOURCE'], - ] - CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] diff --git a/media/mtransport/common.build b/media/mtransport/common.build index 7576ab4fc..4050af366 100644 --- a/media/mtransport/common.build +++ b/media/mtransport/common.build @@ -27,11 +27,6 @@ mtransport_lcppsrcs = [ 'transportlayerprsock.cpp', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - mtransport_lcppsrcs += [ - 'gonk_addrs.cpp', - ] - mtransport_cppsrcs = [ '/media/mtransport/%s' % s for s in sorted(mtransport_lcppsrcs) ] diff --git a/media/mtransport/gonk_addrs.cpp b/media/mtransport/gonk_addrs.cpp deleted file mode 100644 index 1c69b711e..000000000 --- a/media/mtransport/gonk_addrs.cpp +++ /dev/null @@ -1,170 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ -extern "C" { -#include -#include "r_types.h" -#include "stun.h" -#include "addrs.h" -} - -#include -#include -#include "nsINetworkInterface.h" -#include "nsINetworkInterfaceListService.h" -#include "runnable_utils.h" -#include "nsCOMPtr.h" -#include "nsMemory.h" -#include "nsThreadUtils.h" -#include "nsServiceManagerUtils.h" -#include "mozilla/SyncRunnable.h" - -namespace { -struct NetworkInterface { - struct sockaddr_in addr; - std::string name; - // See NR_INTERFACE_TYPE_* in nICEr/src/net/local_addrs.h - int type; -}; - -nsresult -GetInterfaces(std::vector* aInterfaces) -{ - MOZ_ASSERT(aInterfaces); - - // Obtain network interfaces from network manager. - nsresult rv; - nsCOMPtr listService = - do_GetService("@mozilla.org/network/interface-list-service;1", &rv); - NS_ENSURE_SUCCESS(rv, rv); - - int32_t flags = - nsINetworkInterfaceListService::LIST_NOT_INCLUDE_SUPL_INTERFACES | - nsINetworkInterfaceListService::LIST_NOT_INCLUDE_MMS_INTERFACES | - nsINetworkInterfaceListService::LIST_NOT_INCLUDE_IMS_INTERFACES | - nsINetworkInterfaceListService::LIST_NOT_INCLUDE_DUN_INTERFACES | - nsINetworkInterfaceListService::LIST_NOT_INCLUDE_FOTA_INTERFACES; - nsCOMPtr networkList; - NS_ENSURE_SUCCESS(listService->GetDataInterfaceList(flags, - getter_AddRefs(networkList)), - NS_ERROR_FAILURE); - - // Translate nsINetworkInterfaceList to NetworkInterface. - int32_t listLength; - NS_ENSURE_SUCCESS(networkList->GetNumberOfInterface(&listLength), - NS_ERROR_FAILURE); - aInterfaces->clear(); - - for (int32_t i = 0; i < listLength; i++) { - nsCOMPtr info; - if (NS_FAILED(networkList->GetInterfaceInfo(i, getter_AddRefs(info)))) { - continue; - } - - char16_t **ips = nullptr; - uint32_t *prefixs = nullptr; - uint32_t count = 0; - bool isAddressGot = false; - NetworkInterface interface; - memset(&(interface.addr), 0, sizeof(interface.addr)); - interface.addr.sin_family = AF_INET; - - if (NS_FAILED(info->GetAddresses(&ips, &prefixs, &count))) { - continue; - } - - for (uint32_t j = 0; j < count; j++) { - nsAutoString ip; - - ip.Assign(ips[j]); - if (inet_pton(AF_INET, NS_ConvertUTF16toUTF8(ip).get(), - &(interface.addr.sin_addr.s_addr)) == 1) { - isAddressGot = true; - break; - } - } - - free(prefixs); - NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(count, ips); - - if (!isAddressGot) { - continue; - } - - nsAutoString ifaceName; - if (NS_FAILED(info->GetName(ifaceName))) { - continue; - } - interface.name = NS_ConvertUTF16toUTF8(ifaceName).get(); - - int32_t type; - if (NS_FAILED(info->GetType(&type))) { - continue; - } - switch (type) { - case nsINetworkInfo::NETWORK_TYPE_WIFI: - interface.type = NR_INTERFACE_TYPE_WIFI; - break; - case nsINetworkInfo::NETWORK_TYPE_MOBILE: - interface.type = NR_INTERFACE_TYPE_MOBILE; - break; - } - - aInterfaces->push_back(interface); - } - return NS_OK; -} -} // anonymous namespace - -int -nr_stun_get_addrs(nr_local_addr aAddrs[], int aMaxAddrs, - int aDropLoopback, int aDropLinkLocal, int* aCount) -{ - nsresult rv; - int r; - - // Get network interface list. - std::vector interfaces; - nsCOMPtr mainThread = do_GetMainThread(); - mozilla::SyncRunnable::DispatchToThread( - mainThread.get(), - mozilla::WrapRunnableNMRet(&rv, &GetInterfaces, &interfaces), - false); - if (NS_FAILED(rv)) { - return R_FAILED; - } - - // Translate to nr_transport_addr. - int32_t n = 0; - size_t num_interface = std::min(interfaces.size(), (size_t)aMaxAddrs); - for (size_t i = 0; i < num_interface; ++i) { - NetworkInterface &interface = interfaces[i]; - if (nr_sockaddr_to_transport_addr((sockaddr*)&(interface.addr), - IPPROTO_UDP, 0, &(aAddrs[n].addr))) { - r_log(NR_LOG_STUN, LOG_WARNING, "Problem transforming address"); - return R_FAILED; - } - strlcpy(aAddrs[n].addr.ifname, interface.name.c_str(), - sizeof(aAddrs[n].addr.ifname)); - aAddrs[n].interface.type = interface.type; - aAddrs[n].interface.estimated_speed = 0; - n++; - } - - *aCount = n; - r = nr_stun_remove_duplicate_addrs(aAddrs, aDropLoopback, aDropLinkLocal, aCount); - if (r != 0) { - return r; - } - - for (int i = 0; i < *aCount; ++i) { - char typestr[100]; - nr_local_addr_fmt_info_string(aAddrs + i, typestr, sizeof(typestr)); - r_log(NR_LOG_STUN, LOG_DEBUG, "Address %d: %s on %s, type: %s\n", - i, aAddrs[i].addr.as_string, aAddrs[i].addr.ifname, typestr); - } - - return 0; -} diff --git a/media/mtransport/test/moz.build b/media/mtransport/test/moz.build index e8f453787..d769e62f2 100644 --- a/media/mtransport/test/moz.build +++ b/media/mtransport/test/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': +if CONFIG['OS_TARGET'] != 'WINNT': SOURCES += [ 'buffered_stun_socket_unittest.cpp', 'ice_unittest.cpp', diff --git a/media/omx-plugin/lib/ics/libstagefright/moz.build b/media/omx-plugin/lib/ics/libstagefright/moz.build index 1fe19a5fd..b156d151e 100644 --- a/media/omx-plugin/lib/ics/libstagefright/moz.build +++ b/media/omx-plugin/lib/ics/libstagefright/moz.build @@ -5,14 +5,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIST_INSTALL = False -if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': - SOURCES += [ - 'libstagefright.cpp', - ] - # Some codec-related code uses multi-character constants; allow this. - # XXX: could instead use the FOURCC macro to define these constants. - if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']: - SOURCES['libstagefright.cpp'].flags += ['-Wno-error=multichar'] +SOURCES += [ + 'libstagefright.cpp', +] +# Some codec-related code uses multi-character constants; allow this. +# XXX: could instead use the FOURCC macro to define these constants. +if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']: + SOURCES['libstagefright.cpp'].flags += ['-Wno-error=multichar'] SharedLibrary('stagefright') diff --git a/media/omx-plugin/lib/ics/libutils/moz.build b/media/omx-plugin/lib/ics/libutils/moz.build index efce12194..7fa617fb3 100644 --- a/media/omx-plugin/lib/ics/libutils/moz.build +++ b/media/omx-plugin/lib/ics/libutils/moz.build @@ -5,10 +5,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIST_INSTALL = False -if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': - SOURCES += [ - 'libutils.cpp', - ] +SOURCES += [ + 'libutils.cpp', +] SharedLibrary('utils') diff --git a/media/omx-plugin/lib/ics/libvideoeditorplayer/moz.build b/media/omx-plugin/lib/ics/libvideoeditorplayer/moz.build index 4314b1aa2..f05f0f3c9 100644 --- a/media/omx-plugin/lib/ics/libvideoeditorplayer/moz.build +++ b/media/omx-plugin/lib/ics/libvideoeditorplayer/moz.build @@ -5,10 +5,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIST_INSTALL = False -if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': - SOURCES += [ - 'libvideoeditorplayer.cpp', - ] +SOURCES += [ + 'libvideoeditorplayer.cpp', +] SharedLibrary('videoeditorplayer') diff --git a/media/omx-plugin/moz.build b/media/omx-plugin/moz.build index 80b8534f2..004a8bdba 100644 --- a/media/omx-plugin/moz.build +++ b/media/omx-plugin/moz.build @@ -20,13 +20,10 @@ SOURCES += [ SharedLibrary('omxplugin') -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - pass -else: - LOCAL_INCLUDES += [ - 'include/ics', - 'include/ics/media/stagefright/openmax', - ] +LOCAL_INCLUDES += [ + 'include/ics', + 'include/ics/media/stagefright/openmax', +] if CONFIG['GNU_CXX']: # Stagefright header files define many multichar constants. @@ -35,23 +32,11 @@ if CONFIG['GNU_CXX']: '-Wno-shadow', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - EXTRA_DSO_LDOPTS += [ - '-lutils', - '-lstagefright', - '-lmedia', - '-lstagefright_omx', - '-lbinder', - '-lui', - '-lhardware', - '-lcutils', - ] -else: - USE_LIBS += [ - '/media/omx-plugin/lib/ics/libstagefright/stagefright', - '/media/omx-plugin/lib/ics/libutils/utils', - 'videoeditorplayer', - ] +USE_LIBS += [ + '/media/omx-plugin/lib/ics/libstagefright/stagefright', + '/media/omx-plugin/lib/ics/libutils/utils', + 'videoeditorplayer', +] # Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True diff --git a/media/webrtc/moz.build b/media/webrtc/moz.build index 986655c53..4361273b4 100644 --- a/media/webrtc/moz.build +++ b/media/webrtc/moz.build @@ -101,22 +101,21 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']: else: CXXFLAGS += ['-validate-charset-'] -if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': - GYP_DIRS += ['trunk/testing'] - GYP_DIRS['trunk/testing'].input = 'trunk/testing/gtest.gyp' - GYP_DIRS['trunk/testing'].variables = gyp_vars - # We allow warnings for third-party code that can be updated from upstream. - GYP_DIRS['trunk/testing'].sandbox_vars['ALLOW_COMPILER_WARNINGS'] = True - GYP_DIRS['trunk/testing'].non_unified_sources += webrtc_non_unified_sources +GYP_DIRS += ['trunk/testing'] +GYP_DIRS['trunk/testing'].input = 'trunk/testing/gtest.gyp' +GYP_DIRS['trunk/testing'].variables = gyp_vars +# We allow warnings for third-party code that can be updated from upstream. +GYP_DIRS['trunk/testing'].sandbox_vars['ALLOW_COMPILER_WARNINGS'] = True +GYP_DIRS['trunk/testing'].non_unified_sources += webrtc_non_unified_sources - if CONFIG['MOZ_WEBRTC_SIGNALING']: - GYP_DIRS += ['signalingtest'] - GYP_DIRS['signalingtest'].input = 'signaling/signaling.gyp' - GYP_DIRS['signalingtest'].variables = gyp_vars.copy() - GYP_DIRS['signalingtest'].variables.update( - build_for_test=1, - moz_webrtc_mediacodec=0, - build_for_standalone=0 - ) - GYP_DIRS['signalingtest'].sandbox_vars['ALLOW_COMPILER_WARNINGS'] = True - GYP_DIRS['signalingtest'].non_unified_sources += signaling_non_unified_sources +if CONFIG['MOZ_WEBRTC_SIGNALING']: + GYP_DIRS += ['signalingtest'] + GYP_DIRS['signalingtest'].input = 'signaling/signaling.gyp' + GYP_DIRS['signalingtest'].variables = gyp_vars.copy() + GYP_DIRS['signalingtest'].variables.update( + build_for_test=1, + moz_webrtc_mediacodec=0, + build_for_standalone=0 + ) + GYP_DIRS['signalingtest'].sandbox_vars['ALLOW_COMPILER_WARNINGS'] = True + GYP_DIRS['signalingtest'].non_unified_sources += signaling_non_unified_sources diff --git a/media/webrtc/signaling/test/moz.build b/media/webrtc/signaling/test/moz.build index 4d8704de4..aac331b1b 100644 --- a/media/webrtc/signaling/test/moz.build +++ b/media/webrtc/signaling/test/moz.build @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # TODO: bug 1172551 - get these tests working on iOS -if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'uikit': +if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'uikit': GeckoCppUnitTests([ 'jsep_session_unittest', 'jsep_track_unittest', -- cgit v1.2.3