diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
| commit | 2d4ff8df91414b42974c72b2870f5c6e9ad397a8 (patch) | |
| tree | 15b23dc6494a147e723cfdb3765be1568cf6c113 /build | |
| parent | f4b8be889cb7ee31a62af5660f36aaa192599009 (diff) | |
| parent | 14eb8dc7bee8670e39d1199591d335579601f2ad (diff) | |
| download | UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.gz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.lz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.xz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'build')
| -rw-r--r-- | build/gyp.mozbuild | 1 | ||||
| -rw-r--r-- | build/moz.build | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild index 10c3af95d..fd8714ecf 100644 --- a/build/gyp.mozbuild +++ b/build/gyp.mozbuild @@ -44,7 +44,6 @@ gyp_vars = { 'arm_neon': 0, 'arm_neon_optional': 1, - 'moz_widget_toolkit_gonk': 0, 'moz_webrtc_omx': 0, 'moz_webrtc_mediacodec': 0, diff --git a/build/moz.build b/build/moz.build index 616a64c3f..4ac1f2290 100644 --- a/build/moz.build +++ b/build/moz.build @@ -52,16 +52,13 @@ if CONFIG['MOZ_PHOENIX']: 'compare-mozconfig/compare-mozconfigs-wrapper.py', ] -if CONFIG['ENABLE_TESTS'] or CONFIG['MOZ_DMD']: +if CONFIG['ENABLE_TESTS']: FINAL_TARGET_FILES += ['/tools/rb/fix_stack_using_bpsyms.py'] if CONFIG['OS_ARCH'] == 'Darwin': FINAL_TARGET_FILES += ['/tools/rb/fix_macosx_stack.py'] if CONFIG['OS_ARCH'] == 'Linux': FINAL_TARGET_FILES += ['/tools/rb/fix_linux_stack.py'] -if CONFIG['MOZ_DMD']: - FINAL_TARGET_FILES += ['/memory/replace/dmd/dmd.py'] - # Put a useful .gdbinit in the bin directory, to be picked up automatically # by GDB when we debug executables there. FINAL_TARGET_FILES += ['/.gdbinit'] |