Bug 748470 - Remove FORCE dependency from mobile/android/base; r=nalexander

This commit is contained in:
Mike Shal 2013-08-01 18:01:22 -04:00
parent bf8c464545
commit 98243213d9

View File

@ -1370,23 +1370,25 @@ $(RESOURCES): $(RES_DIRS) $(subst res/,$(srcdir)/resources/,$(RESOURCES))
res/values/strings.xml:
$(MAKE) -C locales
# With multilocale builds, there will be multiple strings.xml files. We need to
# rebuild gecko.ap_ if any of them change.
MULTILOCALE_STRINGS_XML_FILES := $(wildcard res/values-*/strings.xml)
all_resources = \
res/drawable-mdpi/icon.png \
res/drawable-hdpi/icon.png \
res/drawable-xhdpi/icon.png \
res/drawable-xxhdpi/icon.png \
res/values/strings.xml \
$(MULTILOCALE_STRINGS_XML_FILES) \
AndroidManifest.xml \
$(RESOURCES) \
$(PP_RES_XML) \
$(NULL)
R.java: $(all_resources)
R.java: FORCE
$(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar -S res -J . --custom-package org.mozilla.gecko
gecko.ap_: $(all_resources)
gecko.ap_: FORCE
$(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar -S res -F $@
fennec_ids.txt: fennec-ids-generator.py R.java