From eda9fe4d1f99e6dfea129b6f32fb0c2e8fd31073 Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Sun, 1 Jan 2012 19:18:48 -0500 Subject: [PATCH] bug 714553 - align embedding/android/Makefile.in with mobile/android/base/Makefile.in r=khuey --- embedding/android/Makefile.in | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/embedding/android/Makefile.in b/embedding/android/Makefile.in index 10a7a603946..8dbfd170d0b 100644 --- a/embedding/android/Makefile.in +++ b/embedding/android/Makefile.in @@ -145,6 +145,13 @@ MOZ_ANDROID_DRAWABLES += embedding/android/resources/drawable/desktop_notificati MOZ_ANDROID_DRAWABLES += $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn | tr '\n' ' '; fi) +RESOURCES=$(RES_LAYOUT) $(RES_VALUES) + +RES_DIRS= \ + res/layout \ + res/values \ + $(NULL) + include $(topsrcdir)/config/rules.mk # Override the Java settings with some specific android settings @@ -169,19 +176,20 @@ res/drawable-hdpi/icon.png: $(MOZ_APP_ICON) $(NSINSTALL) -D res/drawable-hdpi cp $(ICON_PATH_HDPI) $@ +$(RES_DIRS): + rm -rf $@ + $(NSINSTALL) -D $@ + RES_DRAWABLE = $(addprefix res/drawable/,$(notdir $(MOZ_ANDROID_DRAWABLES))) $(RES_DRAWABLE): $(addprefix $(topsrcdir)/,$(MOZ_ANDROID_DRAWABLES)) $(NSINSTALL) -D res/drawable $(NSINSTALL) $^ res/drawable/ -$(RES_LAYOUT): $(subst res/,$(srcdir)/resources/,$(RES_LAYOUT)) - $(NSINSTALL) -D res/layout - $(NSINSTALL) $(srcdir)/resources/layout/* res/layout/ +$(RESOURCES): $(RES_DIRS) $(subst res/,$(srcdir)/resources/,$(RESOURCES)) + @echo "creating $@" + $(NSINSTALL) $(subst res/,$(srcdir)/resources/,$@) $(dir $@) -$(RES_VALUES): $(subst res/,$(srcdir)/resources/,$(RES_VALUES)) - $(NSINSTALL) -D res/values - $(NSINSTALL) $(srcdir)/resources/values/* res/values/ R.java: $(MOZ_APP_ICON) $(RES_LAYOUT) $(RES_DRAWABLE) $(RES_VALUES) res/drawable/icon.png res/drawable-hdpi/icon.png res/values/strings.xml AndroidManifest.xml $(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar -S res -J . --custom-package org.mozilla.gecko