From ca38eefc15ea7ac5158c7a5fcc65f206c886b5dc Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Mon, 21 Jan 2019 17:35:53 +0000 Subject: [PATCH] Bug 901059 - Clean up old unused mobile/android package-manifest.in references. r=agi,froydnj I'm taking an old ticket number just to close it. The files removed no longer exist in the tree; the NSS option exists and probably shouldn't -- but that's for another day, so let's just make it not warn for now. Depends on D15016 Differential Revision: https://phabricator.services.mozilla.com/D15017 --HG-- extra : moz-landing-system : lando --- mobile/android/installer/Makefile.in | 4 ++++ mobile/android/installer/package-manifest.in | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/mobile/android/installer/Makefile.in b/mobile/android/installer/Makefile.in index 8ff3dac7ed8a..0b5bdfdf5874 100644 --- a/mobile/android/installer/Makefile.in +++ b/mobile/android/installer/Makefile.in @@ -30,6 +30,10 @@ DEFINES += \ -DANDROID_CPU_ARCH=$(ANDROID_CPU_ARCH) \ $(NULL) +ifdef NSS_DISABLE_DBM +DEFINES += -DNSS_DISABLE_DBM=1 +endif + ifdef MOZ_DEBUG DEFINES += -DMOZ_DEBUG=1 endif diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 8d43767f72fb..83e249ab5ff5 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -184,8 +184,6 @@ @BINPATH@/components/nsInputListAutoComplete.js @BINPATH@/components/contentAreaDropListener.manifest @BINPATH@/components/contentAreaDropListener.js -@BINPATH@/components/nsINIProcessor.manifest -@BINPATH@/components/nsINIProcessor.js @BINPATH@/components/servicesComponents.manifest @BINPATH@/components/servicesSettings.manifest @BINPATH@/components/RemoteSettingsComponents.js @@ -200,11 +198,6 @@ @BINPATH@/components/htmlMenuBuilder.js @BINPATH@/components/htmlMenuBuilder.manifest -@BINPATH@/components/SystemMessageInternal.js -@BINPATH@/components/SystemMessageManager.js -@BINPATH@/components/SystemMessageCache.js -@BINPATH@/components/SystemMessageManager.manifest - #ifdef MOZ_WEBRTC @BINPATH@/components/PeerConnection.js @BINPATH@/components/PeerConnection.manifest