From 8352fbd0bf7599090e49a09991dc0f9942e0f1bb Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Tue, 25 Oct 2011 11:51:38 -0400 Subject: [PATCH] Bug 696875 - Widget component interfaces not registered r=dougt Change the XPIDL_MODULE in the widget/src/android folder to be different from the one in widget/public, since this value has to be unique across folders. Also include the new XPT in the mobile android build. --- mobile/installer/package-manifest.in | 3 +++ widget/src/android/Makefile.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mobile/installer/package-manifest.in b/mobile/installer/package-manifest.in index 0306a78d86d..c48c5d2dab8 100644 --- a/mobile/installer/package-manifest.in +++ b/mobile/installer/package-manifest.in @@ -259,6 +259,9 @@ #ifdef XP_MACOSX @BINPATH@/components/widget_cocoa.xpt #endif +#ifdef ANDROID +@BINPATH@/components/widget_android.xpt +#endif @BINPATH@/components/windowds.xpt @BINPATH@/components/windowwatcher.xpt @BINPATH@/components/xpcom_base.xpt diff --git a/widget/src/android/Makefile.in b/widget/src/android/Makefile.in index 266caafc61d..a85e8affb65 100644 --- a/widget/src/android/Makefile.in +++ b/widget/src/android/Makefile.in @@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = widget_android -XPIDL_MODULE = widget +XPIDL_MODULE = widget_android EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsWidgetAndroidModule