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

as well as robocop.

2 files changed, 3 insertions, 34 deletions

diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
index 86fc554a16..22801ea9a8 100755
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -64,11 +64,7 @@ LOCAL_INCLUDES += [
     'skia/src/utils/win',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
-    DEFINES['SK_FONTHOST_CAIRO_STANDALONE'] = 0
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in {
-    'android',
     'gtk2',
     'gtk3',
     'uikit',
@@ -143,7 +139,7 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
         '-Wno-unused-private-field',
     ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
 
@@ -153,7 +149,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
 
 import json
 
-platforms = ['linux', 'mac', 'android', 'win']
+platforms = ['linux', 'mac', 'win']
 
 def generate_opt_sources():
   opt_sources = {'opts': {''}}
@@ -261,14 +257,6 @@ def generate_separated_sources(platform_sources):
       'skia/src/ports/SkImageEncoder_none.cpp',
       'skia/src/ports/SkImageGenerator_none.cpp',
     },
-    'android': {
-      # 'skia/src/ports/SkDebug_android.cpp',
-      'skia/src/ports/SkFontHost_cairo.cpp',
-      # 'skia/src/ports/SkFontHost_FreeType.cpp',
-      # 'skia/src/ports/SkFontHost_FreeType_common.cpp',
-      # 'skia/src/ports/SkTime_Unix.cpp',
-      # 'skia/src/utils/SkThreadUtils_pthread.cpp',
-    },
     'linux': {
       'skia/src/ports/SkFontHost_cairo.cpp',
     },
@@ -455,9 +443,6 @@ def write_mozbuild(sources):
   f.write("if CONFIG['MOZ_ENABLE_SKIA_GPU']:\n")
   write_sources(f, sources['gpu'], 4)
 
-  f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):\n")
-  write_sources(f, sources['android'], 4)
-
   f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'uikit'}:\n")
   write_sources(f, sources['mac'], 4)
 
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
index d2ab9566fe..1d9d342f41 100644
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -516,18 +516,6 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
         'skia/src/gpu/GrResourceCache.cpp',
         'skia/src/image/SkImage_Gpu.cpp',
     ]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
-    SOURCES += [
-        'skia/src/ports/SkDebug_android.cpp',
-        'skia/src/ports/SkOSFile_posix.cpp',
-        'skia/src/ports/SkOSLibrary_posix.cpp',
-        'skia/src/ports/SkTLS_pthread.cpp',
-        'skia/src/utils/SkThreadUtils_pthread.cpp',
-    ]
-    SOURCES += [
-        'skia/src/ports/SkFontHost_cairo.cpp',
-        'skia/src/ports/SkFontHost_FreeType_common.cpp',
-    ]
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'uikit'}:
     SOURCES += [
         'skia/src/ports/SkDebug_stdio.cpp',
@@ -674,11 +662,7 @@ LOCAL_INCLUDES += [
     'skia/src/utils/win',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
-    DEFINES['SK_FONTHOST_CAIRO_STANDALONE'] = 0
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in {
-    'android',
     'gtk2',
     'gtk3',
     'uikit',
@@ -749,7 +733,7 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
         '-Wno-unused-private-field',
     ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']