Bug 1417978 - Stop packaging layout debugger on Android. r=nalexander draft
authorJ. Ryan Stinnett <jryans@gmail.com>
Thu, 04 Jan 2018 15:22:35 -0600
changeset 715921 c1d70f85bcfb666a3ba2e482919f0c0079204a5e
parent 715663 f78a83244fbebe8a469ae3512fce7f638cab7e1f
child 744913 90ca4ad6fd498cf08e0a6ec532e7428794d13f1b
push id94289
push userbmo:jryans@gmail.com
push dateThu, 04 Jan 2018 21:52:56 +0000
reviewersnalexander
bugs1417978
milestone59.0a1
Bug 1417978 - Stop packaging layout debugger on Android. r=nalexander The layout debugger UI is only accessible on desktop platforms, so there's no need to include it for Android builds. MozReview-Commit-ID: 8PTDwExU5xz
layout/moz.build
mobile/android/installer/package-manifest.in
--- a/layout/moz.build
+++ b/layout/moz.build
@@ -32,12 +32,12 @@ if CONFIG['NS_PRINTING']:
     DIRS += ['printing']
 
 TEST_DIRS += [
     'tools/reftest',
 ]
 
 DIRS += ['build', 'media']
 
-if CONFIG['MOZ_DEBUG']:
+if CONFIG['MOZ_DEBUG'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     TEST_DIRS += ['tools/layout-debug']
 
 CRASHTEST_MANIFESTS += ['../testing/crashtest/crashtests.list']
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -169,19 +169,16 @@
 @BINPATH@/components/imglib2.xpt
 @BINPATH@/components/inspector.xpt
 @BINPATH@/components/intl.xpt
 @BINPATH@/components/jar.xpt
 @BINPATH@/components/jsdebugger.xpt
 @BINPATH@/components/jsdownloads.xpt
 @BINPATH@/components/jsinspector.xpt
 @BINPATH@/components/layout_base.xpt
-#ifdef MOZ_DEBUG
-@BINPATH@/components/layout_debug.xpt
-#endif
 #ifdef NS_PRINTING
 @BINPATH@/components/layout_printing.xpt
 #endif
 @BINPATH@/components/layout_xul_tree.xpt
 @BINPATH@/components/layout_xul.xpt
 @BINPATH@/components/locale.xpt
 @BINPATH@/components/mimetype.xpt
 @BINPATH@/components/mozfind.xpt