diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-14 10:50:01 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-14 10:50:01 +0200 |
| commit | e9dd029f5d00590e1a53e63b0ab805110a10b54c (patch) | |
| tree | 1126ca5dda925a62be3dc12c99c90e953d08afcf /widget/moz.build | |
| parent | 9d6a7ae25d7f5da855a8f8df884de483b4e2a538 (diff) | |
| parent | 36b8fd734f590eb726ca2e50f8d1ff9cc968b8e1 (diff) | |
| download | UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.gz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.lz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.xz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'widget/moz.build')
| -rw-r--r-- | widget/moz.build | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/widget/moz.build b/widget/moz.build index f69f2d87c..b156346eb 100644 --- a/widget/moz.build +++ b/widget/moz.build @@ -6,9 +6,9 @@ toolkit = CONFIG['MOZ_WIDGET_TOOLKIT'] -if toolkit in ('cocoa', 'android', 'gonk', 'uikit'): +if toolkit in ('cocoa', 'android', 'uikit'): DIRS += [toolkit] -if toolkit in ('android', 'gonk', 'gtk2', 'gtk3'): +if toolkit in ('android', 'gtk2', 'gtk3'): EXPORTS += ['nsIPrintDialogService.h'] if toolkit == 'windows': @@ -222,7 +222,7 @@ if toolkit in ('cocoa', 'windows'): ] if toolkit in {'gtk2', 'gtk3', 'cocoa', 'windows', - 'android', 'gonk', 'uikit'}: + 'android', 'uikit'}: UNIFIED_SOURCES += [ 'nsBaseFilePicker.cpp', ] @@ -236,8 +236,7 @@ if toolkit == 'gtk3': 'nsIApplicationChooser.idl', ] -if not CONFIG['MOZ_B2G']: - DEFINES['MOZ_CROSS_PROCESS_IME'] = True +DEFINES['MOZ_CROSS_PROCESS_IME'] = True include('/ipc/chromium/chromium-config.mozbuild') |