diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
| commit | c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810 (patch) | |
| tree | c7672903a2030d37f861b12900165a015f49d10a /layout/base/moz.build | |
| parent | 451509e2c0188a4164d4b3d1d9f5839ed1e95246 (diff) | |
| parent | 744b044935f7d1d67fbe0df42d898efcbdd00536 (diff) | |
| download | UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.gz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.lz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.xz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.zip | |
Merge remote-tracking branch 'origin/redwood' into release
Diffstat (limited to 'layout/base/moz.build')
| -rw-r--r-- | layout/base/moz.build | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/layout/base/moz.build b/layout/base/moz.build index afc683665..f115280ce 100644 --- a/layout/base/moz.build +++ b/layout/base/moz.build @@ -119,7 +119,7 @@ EXPORTS.mozilla += [ 'StaticPresData.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'AccessibleCaret.cpp', 'AccessibleCaretEventHub.cpp', 'AccessibleCaretManager.cpp', @@ -151,9 +151,11 @@ UNIFIED_SOURCES += [ 'nsLayoutDebugger.cpp', 'nsLayoutHistoryState.cpp', 'nsLayoutUtils.cpp', + 'nsPresArena.cpp', 'nsPresContext.cpp', 'nsPresShell.cpp', 'nsQuoteList.cpp', + 'nsRefreshDriver.cpp', 'nsStyleChangeList.cpp', 'nsStyleSheetService.cpp', 'PaintTracker.cpp', @@ -169,13 +171,6 @@ UNIFIED_SOURCES += [ 'ZoomConstraintsClient.cpp', ] -# nsPresArena.cpp needs to be built separately because it uses plarena.h. -# nsRefreshDriver.cpp needs to be built separately because of name clashes in the OS X headers -SOURCES += [ - 'nsPresArena.cpp', - 'nsRefreshDriver.cpp', -] - if CONFIG['ENABLE_TESTS']: DIRS += ['gtest'] |