diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-03 01:24:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-03 01:24:31 +0200 |
| commit | 4613b91ecac2745252c40be64e73de5ff920b02b (patch) | |
| tree | 26b0aa50bb4d580b156ab2eb9825707a17f51e99 /dom/media/gmp/rlz | |
| parent | e1490c07e29f5e4715f73088b7ca7aab4ada90a6 (diff) | |
| download | UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.gz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.lz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.xz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.zip | |
Remove sandbox ductwork conditional code.
Diffstat (limited to 'dom/media/gmp/rlz')
| -rw-r--r-- | dom/media/gmp/rlz/GMPDeviceBinding.cpp | 8 | ||||
| -rw-r--r-- | dom/media/gmp/rlz/moz.build | 7 |
2 files changed, 0 insertions, 15 deletions
diff --git a/dom/media/gmp/rlz/GMPDeviceBinding.cpp b/dom/media/gmp/rlz/GMPDeviceBinding.cpp index c8aee2bcd..3525f0462 100644 --- a/dom/media/gmp/rlz/GMPDeviceBinding.cpp +++ b/dom/media/gmp/rlz/GMPDeviceBinding.cpp @@ -12,10 +12,6 @@ #ifdef XP_WIN #include "windows.h" -#ifdef MOZ_SANDBOX -#include <intrin.h> -#include <assert.h> -#endif #endif #if defined(HASH_NODE_ID_WITH_DEVICE_ID) @@ -35,10 +31,6 @@ #ifdef XP_WIN #include "windows.h" -#ifdef MOZ_SANDBOX -#include <intrin.h> -#include <assert.h> -#endif #endif #ifdef XP_MACOSX diff --git a/dom/media/gmp/rlz/moz.build b/dom/media/gmp/rlz/moz.build index f366c2b5d..5e85357f1 100644 --- a/dom/media/gmp/rlz/moz.build +++ b/dom/media/gmp/rlz/moz.build @@ -13,13 +13,6 @@ UNIFIED_SOURCES += [ 'GMPDeviceBinding.cpp', ] -if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_TARGET'] in ['WINNT', 'Darwin']: - DEFINES['HASH_NODE_ID_WITH_DEVICE_ID'] = 1; - UNIFIED_SOURCES += [ - 'lib/string_utils.cc', - 'sha256.c', - ] - if CONFIG['OS_TARGET'] == 'WINNT': UNIFIED_SOURCES += [ 'win/lib/machine_id_win.cc', |