Bug 709660 - correctly process resolution-specific Sync resources. r=mbrubeck, r=rnewman, a=akeybl
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -46,16 +46,19 @@ include $(topsrcdir)/ipc/app/defs.mk
DIRS = locales
DIST_FILES = package-name.txt
SYNC_JAVA_FILES=$(shell cat $(topsrcdir)/mobile/android/sync/java-sources.mn | tr '\n' ' ';)
SYNC_PP_JAVA_FILES=$(shell cat $(topsrcdir)/mobile/android/sync/preprocess-sources.mn | tr '\n' ' ';)
SYNC_RES_DRAWABLE=$(shell cat $(topsrcdir)/mobile/android/sync/android-drawable-resources.mn | tr '\n' ' ';)
+SYNC_RES_DRAWABLE_LDPI=$(shell cat $(topsrcdir)/mobile/android/sync/android-drawable-ldpi-resources.mn | tr '\n' ' ';)
+SYNC_RES_DRAWABLE_MDPI=$(shell cat $(topsrcdir)/mobile/android/sync/android-drawable-mdpi-resources.mn | tr '\n' ' ';)
+SYNC_RES_DRAWABLE_HDPI=$(shell cat $(topsrcdir)/mobile/android/sync/android-drawable-hdpi-resources.mn | tr '\n' ' ';)
SYNC_RES_LAYOUT=$(shell cat $(topsrcdir)/mobile/android/sync/android-layout-resources.mn | tr '\n' ' ';)
SYNC_RES_VALUES=$(shell cat $(topsrcdir)/mobile/android/sync/android-values-resources.mn | tr '\n' ' ';)
SYNC_RES_XML=res/xml/sync_authenticator.xml
SYNC_PP_RES_XML=res/xml/sync_syncadapter.xml
JAVAFILES = \
$(SYNC_JAVA_FILES) \
AboutHomeContent.java \
@@ -530,16 +533,19 @@ RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_V11
RES_DIRS= \
res/layout \
res/layout-v11 \
res/values \
res/values-v11 \
res/xml \
res/anim \
res/drawable-nodpi \
+ res/drawable-ldpi \
+ res/drawable-mdpi \
+ res/drawable-hdpi \
res/drawable-mdpi-v8 \
res/drawable-hdpi-v8 \
res/drawable-mdpi-v9 \
res/drawable-hdpi-v9 \
res/drawable-mdpi-v11 \
res/drawable-hdpi-v11 \
res/drawable-xhdpi-v11 \
res/drawable-land-mdpi-v14 \
@@ -584,29 +590,44 @@ res/drawable-hdpi/icon.png: $(MOZ_APP_IC
$(NSINSTALL) -D res/drawable-hdpi
cp $(ICON_PATH_HDPI) $@
RES_DRAWABLE = $(addprefix res/drawable/,$(notdir $(MOZ_ANDROID_DRAWABLES)))
$(RES_DRAWABLE): $(addprefix $(topsrcdir)/,$(MOZ_ANDROID_DRAWABLES))
$(NSINSTALL) -D res/drawable
$(NSINSTALL) $^ res/drawable/
+RES_DRAWABLE_LDPI = $(addprefix res/drawable-ldpi/,$(notdir $(SYNC_RES_DRAWABLE_LDPI)))
+$(RES_DRAWABLE_LDPI): $(addprefix $(topsrcdir)/,$(SYNC_RES_DRAWABLE_LDPI))
+ $(NSINSTALL) -D res/drawable-ldpi
+ $(NSINSTALL) $^ res/drawable-ldpi/
+
+RES_DRAWABLE_MDPI = $(addprefix res/drawable-mdpi/,$(notdir $(SYNC_RES_DRAWABLE_MDPI)))
+$(RES_DRAWABLE_MDPI): $(addprefix $(topsrcdir)/,$(SYNC_RES_DRAWABLE_MDPI))
+ $(NSINSTALL) -D res/drawable-mdpi
+ $(NSINSTALL) $^ res/drawable-mdpi/
+
+RES_DRAWABLE_HDPI = $(addprefix res/drawable-hdpi/,$(notdir $(SYNC_RES_DRAWABLE_HDPI)))
+$(RES_DRAWABLE_HDPI): $(addprefix $(topsrcdir)/,$(SYNC_RES_DRAWABLE_HDPI))
+ $(NSINSTALL) -D res/drawable-hdpi
+ $(NSINSTALL) $^ res/drawable-hdpi/
+
res/values/defaults.xml: $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/res/values/defaults.xml
$(NSINSTALL) -D res/values
$(NSINSTALL) $^ res/values
$(RES_DIRS):
rm -rf $@
$(NSINSTALL) -D $@
$(RESOURCES): $(RES_DIRS) $(subst res/,$(srcdir)/resources/,$(RESOURCES))
@echo "creating $@"
$(NSINSTALL) $(subst res/,$(srcdir)/resources/,$@) $(dir $@)
-R.java: $(MOZ_APP_ICON) $(RESOURCES) $(RES_DRAWABLE) $(PP_RES_XML) res/values/defaults.xml res/drawable/sync_icon.png res/drawable/icon.png res/drawable-hdpi/icon.png res/values/strings.xml AndroidManifest.xml FORCE
+R.java: $(MOZ_APP_ICON) $(RESOURCES) $(RES_DRAWABLE) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_MDPI) $(RES_DRAWABLE_HDPI) $(PP_RES_XML) res/values/defaults.xml res/drawable/sync_icon.png res/drawable/icon.png res/drawable-hdpi/icon.png res/values/strings.xml AndroidManifest.xml FORCE
$(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar -S res -J . --custom-package org.mozilla.gecko
-gecko.ap_: AndroidManifest.xml res/drawable/sync_icon.png res/drawable/icon.png res/drawable-hdpi/icon.png $(RESOURCES) $(RES_DRAWABLE) $(PP_RES_XML) res/values/defaults.xml res/values/strings.xml FORCE
+gecko.ap_: AndroidManifest.xml res/drawable/sync_icon.png res/drawable/icon.png res/drawable-hdpi/icon.png $(RESOURCES) $(RES_DRAWABLE) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_MDPI) $(RES_DRAWABLE_HDPI) $(PP_RES_XML) res/values/defaults.xml res/values/strings.xml FORCE
$(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar -S res -F $@
libs:: classes.dex package-name.txt
$(INSTALL) classes.dex $(FINAL_TARGET)
$(INSTALL) package-name.txt $(FINAL_TARGET)
new file mode 100644
--- /dev/null
+++ b/mobile/android/sync/android-drawable-hdpi-resources.mn
@@ -0,0 +1,1 @@
+mobile/android/base/resources/drawable-hdpi/sync_ic_launcher.png
new file mode 100644
--- /dev/null
+++ b/mobile/android/sync/android-drawable-ldpi-resources.mn
@@ -0,0 +1,1 @@
+mobile/android/base/resources/drawable-ldpi/sync_ic_launcher.png
new file mode 100644
--- /dev/null
+++ b/mobile/android/sync/android-drawable-mdpi-resources.mn
@@ -0,0 +1,1 @@
+mobile/android/base/resources/drawable-mdpi/sync_ic_launcher.png
--- a/mobile/android/sync/android-drawable-resources.mn
+++ b/mobile/android/sync/android-drawable-resources.mn
@@ -1,4 +1,1 @@
mobile/android/base/resources/drawable/sync_icon.png
-mobile/android/base/resources/drawable-hdpi/sync_ic_launcher.png
-mobile/android/base/resources/drawable-ldpi/sync_ic_launcher.png
-mobile/android/base/resources/drawable-mdpi/sync_ic_launcher.png