Issue #1053 - Remove /dom/system/android and dependent modules,

as well as robocop.

8 files changed, 12 insertions, 89 deletions

diff --git a/media/libaom/moz.build b/media/libaom/moz.build
index aedac31022..68da0406c0 100644
--- a/media/libaom/moz.build
+++ b/media/libaom/moz.build
@@ -27,7 +27,7 @@ if CONFIG['CPU_ARCH'] == 'x86_64':
         ASFLAGS += [ '-I%s/media/libaom/config/mac/x64/' % TOPSRCDIR ]
         LOCAL_INCLUDES += [ '/media/libaom/config/mac/x64/' ]
         EXPORTS.aom += [ 'config/mac/x64/config/aom_config.h' ]
-    else: # Android, Linux, BSDs, etc.
+    else: # Linux, SunOS, etc.
         ASFLAGS += [ '-I%s/media/libaom/config/linux/x64/' % TOPSRCDIR ]
         LOCAL_INCLUDES += [ '/media/libaom/config/linux/x64/' ]
         EXPORTS.aom += [ 'config/linux/x64/config/aom_config.h' ]
@@ -45,7 +45,7 @@ elif CONFIG['CPU_ARCH'] == 'x86':
             LOCAL_INCLUDES += [ '/media/libaom/config/win/ia32/' ]
             EXPORTS.aom += [ 'config/win/ia32/config/aom_config.h' ]
             NO_PGO = True
-    else: # Android, Linux, BSDs, etc.
+    else: # Linux, SunOS, etc.
         ASFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ]
         LOCAL_INCLUDES += [ '/media/libaom/config/linux/ia32/' ]
         EXPORTS.aom += [ 'config/linux/ia32/config/aom_config.h' ]
@@ -71,11 +71,6 @@ elif CONFIG['CPU_ARCH'] == 'arm':
         if f.endswith('neon.c'):
             SOURCES[f].flags += CONFIG['VPX_ASFLAGS']
 
-    if CONFIG['OS_TARGET'] == 'Android':
-        # For cpu-features.h
-        LOCAL_INCLUDES += [
-            '%%%s/sources/android/cpufeatures' % CONFIG['ANDROID_NDK'],
-        ]
     if CONFIG['CLANG_CXX']:
         ASFLAGS += [
             '-no-integrated-as',
@@ -96,16 +91,6 @@ ALLOW_COMPILER_WARNINGS = True
 
 FINAL_LIBRARY = 'gkmedias'
 
-if CONFIG['OS_TARGET'] == 'Android':
-    # Older versions of the Android NDK don't pre-define anything to indicate
-    # the OS they're on, so do it for them.
-    DEFINES['__linux__'] = True
-
-    if not CONFIG['MOZ_WEBRTC']:
-        SOURCES += [
-            '%%%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'],
-        ]
-
 if CONFIG['CLANG_CL'] or not CONFIG['_MSC_VER']:
     for f in SOURCES:
         if f.endswith('sse2.c'):
diff --git a/media/libstagefright/moz.build b/media/libstagefright/moz.build
index a8876638aa..f1f23eabf7 100644
--- a/media/libstagefright/moz.build
+++ b/media/libstagefright/moz.build
@@ -35,16 +35,15 @@ elif CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'OpenBSD', 'NetBSD',
 else:
     DEFINES['HAVE_SYS_UIO_H'] = True
 
-if CONFIG['OS_TARGET'] != 'Android':
-    DEFINES['FAKE_LOG_DEVICE'] = True
-    SOURCES += [
-        'system/core/liblog/fake_log_device.c',
-    ]
-    UNIFIED_SOURCES += [
-        'system/core/libcutils/strdup16to8.c',
-        'system/core/liblog/logd_write.c',
-        'system/core/liblog/logprint.c',
-    ]
+DEFINES['FAKE_LOG_DEVICE'] = True
+SOURCES += [
+    'system/core/liblog/fake_log_device.c',
+]
+UNIFIED_SOURCES += [
+    'system/core/libcutils/strdup16to8.c',
+    'system/core/liblog/logd_write.c',
+    'system/core/liblog/logprint.c',
+]
 
 EXPORTS.mp4_demuxer += [
     'binding/include/mp4_demuxer/Adts.h',
diff --git a/media/libtheora/moz.build b/media/libtheora/moz.build
index 0a88d8f92c..8bcdb5fd47 100644
--- a/media/libtheora/moz.build
+++ b/media/libtheora/moz.build
@@ -94,10 +94,6 @@ if CONFIG['GNU_AS']:
                     'OC_ARM_ASM_MEDIA',
                     'OC_ARM_ASM_NEON'):
             DEFINES[var] = True
-        # The Android NDK doesn't pre-define anything to indicate the OS it's
-        # on, so do it for them.
-        if CONFIG['OS_TARGET'] == 'Android':
-            DEFINES['__linux__'] = True
 
         SOURCES += [ '!%s.s' % f for f in [
             'armbits-gnu',
diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build
index 1630f6da45..c53ddb2f25 100644
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -45,11 +45,6 @@ if CONFIG['VPX_ARM_ASM']:
         if f.endswith('.c') and 'neon' in f:
             SOURCES[f].flags += CONFIG['VPX_ASFLAGS']
 
-    if CONFIG['OS_TARGET'] == 'Android':
-        # For cpu-features.h
-        LOCAL_INCLUDES += [
-            '%%%s/sources/android/cpufeatures' % CONFIG['ANDROID_NDK'],
-        ]
     if CONFIG['CLANG_CXX']:
         ASFLAGS += [
             '-no-integrated-as',
@@ -72,16 +67,6 @@ FINAL_LIBRARY = 'gkmedias'
 
 DEFINES['HAVE_CONFIG_H'] = 'vpx_config.h'
 
-if CONFIG['OS_TARGET'] == 'Android':
-    # Older versions of the Android NDK don't pre-define anything to indicate
-    # the OS they're on, so do it for them.
-    DEFINES['__linux__'] = True
-
-    if not CONFIG['MOZ_WEBRTC']:
-        SOURCES += [
-            '%%%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'],
-        ]
-
 if CONFIG['CLANG_CL'] or not CONFIG['_MSC_VER']:
     for f in SOURCES:
         if f.endswith('.c'):
@@ -112,9 +97,3 @@ ASFLAGS += [
     '-I%s/media/libvpx/' % TOPSRCDIR,
     '-I%s/media/libvpx/vpx_ports/' % TOPSRCDIR,
 ]
-
-if CONFIG['OS_TARGET'] == 'Android':
-    # For LIBVPX_RAND
-    ASFLAGS += [
-        '-D__ANDROID__'
-    ]
diff --git a/media/libyuv/PRESUBMIT.py b/media/libyuv/PRESUBMIT.py
index 58242bd984..e194fa35a6 100644
--- a/media/libyuv/PRESUBMIT.py
+++ b/media/libyuv/PRESUBMIT.py
@@ -50,15 +50,6 @@ def GetPreferredTryMasters(project, change):
     'linux_msan',
     'linux_ubsan',
     'linux_ubsan_vptr',
-    'android',
-    'android_rel',
-    'android_clang',
-    'android_arm64',
-    'android_mips',
-    'android_x64',
-    'android_x86',
-    'android_gn',
-    'android_gn_rel',
   ]
   if not files or all(re.search(r'[\\/]OWNERS$', f) for f in files):
     return {}
diff --git a/media/libyuv/gyp_libyuv b/media/libyuv/gyp_libyuv
index 445b924f16..bce1061a17 100644
--- a/media/libyuv/gyp_libyuv
+++ b/media/libyuv/gyp_libyuv
@@ -75,7 +75,7 @@ if __name__ == '__main__':
 
   # Automatically turn on crosscompile support for platforms that need it.
   if all(('ninja' in os.environ.get('GYP_GENERATORS', ''),
-          gyp_vars_dict.get('OS') in ['android', 'ios'],
+          gyp_vars_dict.get('OS') in ['ios'],
           'GYP_CROSSCOMPILE' not in os.environ)):
     os.environ['GYP_CROSSCOMPILE'] = '1'
 
diff --git a/media/libyuv/setup_links.py b/media/libyuv/setup_links.py
index b2b459e60c..b3c8c9a0af 100644
--- a/media/libyuv/setup_links.py
+++ b/media/libyuv/setup_links.py
@@ -60,27 +60,6 @@ DIRECTORIES = [
 
 from sync_chromium import get_target_os_list
 target_os = get_target_os_list()
-if 'android' in target_os:
-  DIRECTORIES += [
-    'base',
-    'third_party/android_platform',
-    'third_party/android_tools',
-    'third_party/appurify-python',
-    'third_party/ashmem',
-    'third_party/catapult',
-    'third_party/icu',
-    'third_party/ijar',
-    'third_party/jsr-305',
-    'third_party/junit',
-    'third_party/libxml',
-    'third_party/mockito',
-    'third_party/modp_b64',
-    'third_party/protobuf',
-    'third_party/requests',
-    'third_party/robolectric',
-    'tools/android',
-    'tools/grit',
-  ]
 if 'ios' in target_os:
   DIRECTORIES.append('third_party/class-dump')
 
diff --git a/media/mtransport/common.build b/media/mtransport/common.build
index 3ba5b63efc..eb262df185 100644
--- a/media/mtransport/common.build
+++ b/media/mtransport/common.build
@@ -61,12 +61,6 @@ elif CONFIG['OS_TARGET'] == 'Linux':
     LOCAL_INCLUDES += [
         '/media/mtransport/third_party/nrappkit/src/port/linux/include',
     ]
-elif CONFIG['OS_TARGET'] == 'Android':
-    DEFINES['LINUX'] = True
-    DEFINES['ANDROID'] = True
-    LOCAL_INCLUDES += [
-        '/media/mtransport/third_party/nrappkit/src/port/android/include',
-    ]
 elif CONFIG['OS_TARGET'] == 'WINNT':
     DEFINES['WIN'] = True
     # for stun.h