From 57fc90802b232963a721d761d5f2a2c048765477 Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Thu, 8 Sep 2016 13:25:59 +0900 Subject: [PATCH] Bug 1299755 - Remove updates.properties from APK. r=sebastian updates.properties uses on Fennec/XUL. But after bug 786380, we use native version for update service. MozReview-Commit-ID: CREAeLdlrJH --HG-- extra : rebase_source : 1412c541e4c4f9e7d1bb98e2466ae6cc60c062e0 extra : histedit_source : 7a431e1ed942d9766fcd690e4b01bc7774203ba7 --- mobile/android/locales/jar.mn | 2 -- toolkit/locales/jar.mn | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/android/locales/jar.mn b/mobile/android/locales/jar.mn index 69975f17e4f6..a2146319a7ac 100644 --- a/mobile/android/locales/jar.mn +++ b/mobile/android/locales/jar.mn @@ -48,7 +48,6 @@ relativesrcdir toolkit/locales: locale/@AB_CD@/browser/overrides/intl.css (%chrome/global/intl.css) locale/@AB_CD@/browser/overrides/passwordmgr.properties (%chrome/passwordmgr/passwordmgr.properties) locale/@AB_CD@/browser/overrides/search/search.properties (%chrome/search/search.properties) - locale/@AB_CD@/browser/overrides/update/updates.properties (%chrome/mozapps/update/updates.properties) # plugins locale/@AB_CD@/browser/overrides/plugins/pluginproblem.dtd (%chrome/pluginproblem/pluginproblem.dtd) # about:support @@ -76,7 +75,6 @@ relativesrcdir toolkit/locales: % override chrome://global/locale/intl.css chrome://browser/locale/overrides/intl.css % override chrome://passwordmgr/locale/passwordmgr.properties chrome://browser/locale/overrides/passwordmgr/passwordmgr.properties % override chrome://global/locale/search/search.properties chrome://browser/locale/overrides/search/search.properties -% override chrome://mozapps/locale/update/updates.properties chrome://browser/locale/overrides/update/updates.properties % override chrome://pluginproblem/locale/pluginproblem.dtd chrome://browser/locale/overrides/plugins/pluginproblem.dtd % override chrome://global/locale/aboutSupport.dtd chrome://browser/locale/overrides/global/aboutSupport.dtd % override chrome://global/locale/aboutSupport.properties chrome://browser/locale/overrides/global/aboutSupport.properties diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn index 014eb2d8915a..d48d454617a6 100644 --- a/toolkit/locales/jar.mn +++ b/toolkit/locales/jar.mn @@ -119,8 +119,10 @@ locale/@AB_CD@/mozapps/profile/createProfileWizard.dtd (%chrome/mozapps/profile/createProfileWizard.dtd) locale/@AB_CD@/mozapps/profile/profileSelection.properties (%chrome/mozapps/profile/profileSelection.properties) locale/@AB_CD@/mozapps/profile/profileSelection.dtd (%chrome/mozapps/profile/profileSelection.dtd) +#ifndef MOZ_FENNEC locale/@AB_CD@/mozapps/update/updates.dtd (%chrome/mozapps/update/updates.dtd) locale/@AB_CD@/mozapps/update/updates.properties (%chrome/mozapps/update/updates.properties) +#endif locale/@AB_CD@/mozapps/update/history.dtd (%chrome/mozapps/update/history.dtd) locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd (%chrome/mozapps/extensions/xpinstallConfirm.dtd) locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties (%chrome/mozapps/extensions/xpinstallConfirm.properties)