Backed out changesets b1b292d8e383 and 24af5272b52f (bug 913842) for Android bustage.

This commit is contained in:
Mike Hommey 2013-09-10 09:38:25 +09:00
parent 0beb0283c8
commit b99dc04b29
2 changed files with 5 additions and 7 deletions

View File

@ -1386,16 +1386,15 @@ res/drawable-xxhdpi/icon.png: $(ICON_PATH_XXHDPI)
$(NSINSTALL) -D res/drawable-xxhdpi
cp $(ICON_PATH_XXHDPI) $@
$(call mkdir_deps,$(RES_DIRS)): $(subst res/,$(srcdir)/resources/,$(RESOURCES))
$(RM) -r $(@D)
$(NSINSTALL) -D $(@D)
$(TOUCH) -t 198001030000 $@
$(RES_DIRS): $(subst res/,$(srcdir)/resources/,$(RESOURCES))
$(RM) -r $@
$(NSINSTALL) -D $@
$(RESOURCES): $(call mkdir_deps,$(RES_DIRS)) $(subst res/,$(srcdir)/resources/,$(RESOURCES))
$(RESOURCES): $(RES_DIRS) $(subst res/,$(srcdir)/resources/,$(RESOURCES))
@echo "creating $@"
$(NSINSTALL) $(subst res/,$(srcdir)/resources/,$@) $(dir $@)
res/values/strings.xml: $(call mkdir_deps,$(RES_DIRS))
res/values/strings.xml: $(RES_DIRS)
$(MAKE) -C locales
# With multilocale builds, there will be multiple strings.xml files. We need to

View File

@ -61,7 +61,6 @@ strings-xml-preqs =\
$(dir-strings-xml)/strings.xml: $(strings-xml-preqs)
$(NSINSTALL) -D $(dir-strings-xml)
$(TOUCH) -t 198001030000 $(dir-strings-xml)
$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
$(DEFINES) \
-DBRANDPATH="$(BRANDPATH)" \