diff options
Diffstat (limited to 'toolkit/moz.configure')
| -rw-r--r-- | toolkit/moz.configure | 51 |
1 files changed, 8 insertions, 43 deletions
diff --git a/toolkit/moz.configure b/toolkit/moz.configure index 792fb113d..128402257 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -14,9 +14,6 @@ option('--enable-systrace', env='MOZ_USE_SYSTRACE', @depends('--enable-systrace', target) def systrace(value, target): - if value and target.os != 'Android': - die('--enable-systrace cannot be used when targeting %s', - target.os) if value: return True @@ -66,7 +63,7 @@ set_config('L10NBASEDIR', l10n_base) # reason. option('--enable-default-toolkit', nargs=1, choices=('cairo-windows', 'cairo-gtk2', 'cairo-gtk2-x11', 'cairo-gtk3', - 'cairo-cocoa', 'cairo-uikit', 'cairo-android'), + 'cairo-cocoa', 'cairo-uikit'), help='Select default toolkit') @depends('--enable-default-toolkit', target) @@ -80,13 +77,6 @@ def toolkit(value, target): platform_choices = ('cairo-cocoa',) elif target.os == 'iOS': platform_choices = ('cairo-uikit',) - elif target.os == 'Android': - if value.origin == 'implied': - # Trust values coming from imply_option() (used in - # b2g/moz.configure). - platform_choices = tuple(value) - else: - platform_choices = ('cairo-android',) else: platform_choices = ('cairo-gtk3', 'cairo-gtk2', 'cairo-gtk2-x11') @@ -185,7 +175,7 @@ set_define(gl_provider_define, True) # ============================================================== @depends(toolkit) def pdf_printing(toolkit): - if toolkit in ('windows', 'gtk2', 'gtk3', 'android'): + if toolkit in ('windows', 'gtk2', 'gtk3'): return True @depends(pdf_printing) @@ -207,8 +197,7 @@ option(env='MOZ_INSTRUMENT_EVENT_LOOP', @depends('MOZ_INSTRUMENT_EVENT_LOOP', toolkit) def instrument_event_loop(value, toolkit): - if value or (toolkit in ('windows', 'gtk2', 'gtk3', 'cocoa', - 'android') and value.origin == 'default'): + if value or (toolkit in ('windows', 'gtk2', 'gtk3', 'cocoa') and value.origin == 'default'): return True set_config('MOZ_INSTRUMENT_EVENT_LOOP', instrument_event_loop) @@ -266,8 +255,7 @@ add_old_configure_assignment('_HAVE_FREETYPE2', # ============================================================== @depends(target) def tree_freetype(target): - if target.os == 'Android': - return True + return None set_define('MOZ_TREE_FREETYPE', tree_freetype) set_config('MOZ_TREE_FREETYPE', tree_freetype) @@ -332,7 +320,7 @@ option('--disable-ffmpeg', def ffmpeg(value, target): enabled = bool(value) if value.origin == 'default': - enabled = target.os not in ('Android', 'WINNT') + enabled = target.os not in ('WINNT') if enabled: return True @@ -349,8 +337,7 @@ option('--disable-fmp4', env='MOZ_FMP4', def fmp4(value, target, wmf, applemedia): enabled = bool(value) if value.origin == 'default': - # target.os == 'Android' includes all B2G versions - enabled = wmf or applemedia or target.os == 'Android' + enabled = wmf or applemedia if enabled: return True @@ -390,7 +377,7 @@ set_config('MOZ_PACKAGER_FORMAT', packager_format) def jar_maker_format(host, build_project): # Multilocales for mobile/android use the same mergedirs for all locales, # so we can't use symlinks for those builds. - if host.os == 'WINNT' or build_project == 'mobile/android': + if host.os == 'WINNT': return 'flat' return 'symlink' @@ -398,23 +385,10 @@ set_config('MOZ_JAR_MAKER_FILE_FORMAT', jar_maker_format) @depends(toolkit) def omnijar_name(toolkit): - # Fennec's static resources live in the assets/ folder of the - # APK. Adding a path to the name here works because we only - # have one omnijar file in the final package (which is not the - # case on desktop), and necessitates some contortions during - # packaging so that the resources in the omnijar are considered - # as rooted at / and not as rooted at assets/ (which again is - # not the case on desktop: there are omnijars rooted at webrtc/, - # etc). packager.mk handles changing the rooting of the single - # omnijar. - return 'assets/omni.ja' if toolkit == 'android' else 'omni.ja' + return 'omni.ja' set_config('OMNIJAR_NAME', omnijar_name) -project_flag('MOZ_ANDROID_HISTORY', - help='Enable Android History instead of Places', - set_as_define=True) - # Permissions system # ============================================================== option(name='--disable-permissions', @@ -585,8 +559,6 @@ option('--enable-ipdl-tests', help='Enable expensive IPDL tests') set_config('MOZ_IPDL_TESTS', depends_if('--enable-ipdl-tests')(lambda _: True)) -include('nss.configure') - # Network protocol support # ============================================================== @depends(check_build_environment, '--help') @@ -667,13 +639,6 @@ set_config('MOZ_ENABLE_SKIA', skia) set_define('MOZ_ENABLE_SKIA', skia) set_define('USE_SKIA', skia) -@depends(skia, target) -def skia_android(skia, target): - if skia and target.os == 'Android': - return True - -set_define('SK_BUILD_FOR_ANDROID_NDK', skia_android) - option('--disable-skia-gpu', help='Disable use of Skia-GPU') @depends('--disable-skia-gpu', skia, target) |