From 4924713f070dd91b530179356d85c51a57986b3f Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Fri, 19 Jul 2013 13:59:42 -0700 Subject: [PATCH] Bug 892603 - Remove unused MOZ_APP_ICON and LINUX_BRANDING_FILES from mobile/android/base/Makefile.in. r=mfinkle MOZ_APP_ICON was a Makefile dependency not mentioned elsewhere in the tree. The text `LINUX_BRANDING` does not appear in the tree. There are no references to `fennec_48x48.png` or `fennec_72x72.png` outside of mobile/android/base/Makefile.in, and that file explicitly copies the referenced files (so does not depend on the deleted export rules). This leaves the relevant Makefile.in files empty, so we can remove them. --HG-- extra : rebase_source : a62f1571ba43a8c7171db9dab7c39346ae3577b1 --- mobile/android/base/Makefile.in | 8 +++--- .../branding/aurora/content/Makefile.in | 25 ------------------- .../android/branding/beta/content/Makefile.in | 25 ------------------- .../branding/nightly/content/Makefile.in | 25 ------------------- .../branding/official/content/Makefile.in | 25 ------------------- .../branding/unofficial/content/Makefile.in | 25 ------------------- 6 files changed, 4 insertions(+), 129 deletions(-) delete mode 100644 mobile/android/branding/aurora/content/Makefile.in delete mode 100644 mobile/android/branding/beta/content/Makefile.in delete mode 100644 mobile/android/branding/nightly/content/Makefile.in delete mode 100644 mobile/android/branding/official/content/Makefile.in delete mode 100644 mobile/android/branding/unofficial/content/Makefile.in diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index 08e37dab91d9..e86f68b26818 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -1342,19 +1342,19 @@ $(FENNEC_PP_JAVA_VIEW_FILES): GeckoView.java.frag @rm -f $@ cat $< | sed s,@VIEWTYPE@,$(patsubst Gecko%.java,%,$@),g >> $@ ; \ -res/drawable-mdpi/icon.png: $(MOZ_APP_ICON) +res/drawable-mdpi/icon.png: $(ICON_PATH) $(NSINSTALL) -D res/drawable-mdpi cp $(ICON_PATH) $@ -res/drawable-hdpi/icon.png: $(MOZ_APP_ICON) +res/drawable-hdpi/icon.png: $(ICON_PATH_HDPI) $(NSINSTALL) -D res/drawable-hdpi cp $(ICON_PATH_HDPI) $@ -res/drawable-xhdpi/icon.png: $(MOZ_APP_ICON) +res/drawable-xhdpi/icon.png: $(ICON_PATH_XHDPI) $(NSINSTALL) -D res/drawable-xhdpi cp $(ICON_PATH_XHDPI) $@ -res/drawable-xxhdpi/icon.png: $(MOZ_APP_ICON) +res/drawable-xxhdpi/icon.png: $(ICON_PATH_XXHDPI) $(NSINSTALL) -D res/drawable-xxhdpi cp $(ICON_PATH_XXHDPI) $@ diff --git a/mobile/android/branding/aurora/content/Makefile.in b/mobile/android/branding/aurora/content/Makefile.in deleted file mode 100644 index e9280157ddf1..000000000000 --- a/mobile/android/branding/aurora/content/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -# Branding Makefile -# - jars chrome artwork - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk - -LINUX_BRANDING_FILES = \ - fennec_48x48.png \ - fennec_72x72.png \ - $(NULL) - -export:: - $(NSINSTALL) -D $(DIST)/branding - cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/ - $(NSINSTALL) -D $(DIST)/install diff --git a/mobile/android/branding/beta/content/Makefile.in b/mobile/android/branding/beta/content/Makefile.in deleted file mode 100644 index e9280157ddf1..000000000000 --- a/mobile/android/branding/beta/content/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -# Branding Makefile -# - jars chrome artwork - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk - -LINUX_BRANDING_FILES = \ - fennec_48x48.png \ - fennec_72x72.png \ - $(NULL) - -export:: - $(NSINSTALL) -D $(DIST)/branding - cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/ - $(NSINSTALL) -D $(DIST)/install diff --git a/mobile/android/branding/nightly/content/Makefile.in b/mobile/android/branding/nightly/content/Makefile.in deleted file mode 100644 index e9280157ddf1..000000000000 --- a/mobile/android/branding/nightly/content/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -# Branding Makefile -# - jars chrome artwork - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk - -LINUX_BRANDING_FILES = \ - fennec_48x48.png \ - fennec_72x72.png \ - $(NULL) - -export:: - $(NSINSTALL) -D $(DIST)/branding - cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/ - $(NSINSTALL) -D $(DIST)/install diff --git a/mobile/android/branding/official/content/Makefile.in b/mobile/android/branding/official/content/Makefile.in deleted file mode 100644 index e9280157ddf1..000000000000 --- a/mobile/android/branding/official/content/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -# Branding Makefile -# - jars chrome artwork - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk - -LINUX_BRANDING_FILES = \ - fennec_48x48.png \ - fennec_72x72.png \ - $(NULL) - -export:: - $(NSINSTALL) -D $(DIST)/branding - cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/ - $(NSINSTALL) -D $(DIST)/install diff --git a/mobile/android/branding/unofficial/content/Makefile.in b/mobile/android/branding/unofficial/content/Makefile.in deleted file mode 100644 index e9280157ddf1..000000000000 --- a/mobile/android/branding/unofficial/content/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -# Branding Makefile -# - jars chrome artwork - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk - -LINUX_BRANDING_FILES = \ - fennec_48x48.png \ - fennec_72x72.png \ - $(NULL) - -export:: - $(NSINSTALL) -D $(DIST)/branding - cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/ - $(NSINSTALL) -D $(DIST)/install