From 600934bface36f69533710cd66b2d629ab7448aa Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Thu, 20 Aug 2015 15:10:34 -0700 Subject: [PATCH] Bug 1196970 - Part 1: Fix some dependency paths. r=me --HG-- extra : commitid : AcixmeCeASb extra : rebase_source : c4659af6c45c8ce153cf47f9cb5df4229ae13e90 extra : source : 37f6f08a839dbc5f3c940dfd02e1537535ee129e extra : histedit_source : da6d791c46f62cc5d73d8d650b94d5cee70b9cf7 --- mobile/android/base/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index 0aa3f3002b6a..a8ffadd344b9 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -311,7 +311,7 @@ res/raw/browsersearch.json: .locales.deps ; res/raw/suggestedsites.json: .locales.deps ; all_resources = \ - $(CURDIR)/AndroidManifest.xml \ + $(abspath $(CURDIR)/AndroidManifest.xml) \ $(android_res_files) \ $(ANDROID_GENERATED_RESFILES) \ $(NULL) @@ -420,8 +420,8 @@ endef # .aapt.deps: $(all_resources) $(eval $(call aapt_command,.aapt.deps,$(all_resources),gecko.ap_,generated/,./)) -# .aapt.nodeps: $(CURDIR)/AndroidManifest.xml FORCE -$(eval $(call aapt_command,.aapt.nodeps,$(CURDIR)/AndroidManifest.xml FORCE,gecko-nodeps.ap_,gecko-nodeps/,gecko-nodeps/)) +# .aapt.nodeps: $(abspath $(CURDIR)/AndroidManifest.xml) FORCE +$(eval $(call aapt_command,.aapt.nodeps,$(abspath $(CURDIR)/AndroidManifest.xml) FORCE,gecko-nodeps.ap_,gecko-nodeps/,gecko-nodeps/)) # Override the Java settings with some specific android settings include $(topsrcdir)/config/android-common.mk