diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
| commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
| tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /toolkit/content/moz.build | |
| parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
| parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
| download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip | |
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'toolkit/content/moz.build')
| -rw-r--r-- | toolkit/content/moz.build | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/toolkit/content/moz.build b/toolkit/content/moz.build index de50a82f5..0a08483b4 100644 --- a/toolkit/content/moz.build +++ b/toolkit/content/moz.build @@ -4,28 +4,19 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -TEST_DIRS += ['tests'] - -for var in ('target', 'MOZ_CONFIGURE_OPTIONS', 'CC', 'CC_VERSION', 'CXX'): +for var in ('target', + 'MOZ_CONFIGURE_OPTIONS', + 'CC', + 'CC_VERSION', + 'CXX'): DEFINES[var] = CONFIG[var] DEFINES['CFLAGS'] = CONFIG['OS_CFLAGS'] - -if CONFIG['OS_TARGET'] == 'Android': - DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME'] +DEFINES['TOPOBJDIR'] = TOPOBJDIR if CONFIG['MOZ_ANDROID_CXX_STL'] == 'libc++': DEFINES['MOZ_USE_LIBCXX'] = True JAR_MANIFESTS += ['jar.mn'] -with Files('aboutTelemetry.*'): - BUG_COMPONENT = ('Toolkit', 'Telemetry') -with Files('customizeToolbar.*'): - BUG_COMPONENT = ('Toolkit', 'Toolbars and Toolbar Customization') - -with Files('widgets/*'): - BUG_COMPONENT = ('Toolkit', 'XUL Widgets') - -DEFINES['TOPOBJDIR'] = TOPOBJDIR |