diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index e9362976f8fb..6b59cfa03765 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -287,7 +287,7 @@ classycle_jar := $(topsrcdir)/mobile/android/build/classycle/classycle-1.4.1.jar -outjars jars-proguarded \ -libraryjars $(library_jars) -ANNOTATION_PROCESSOR_JAR_FILES := $(DEPTH)/build/annotationProcessors/annotationProcessors.jar +ANNOTATION_PROCESSOR_JAR_FILES := $(abspath $(DEPTH)/build/annotationProcessors/annotationProcessors.jar) # This annotation processing step also generates # GeneratedJNIWrappers.h and GeneratedJNINatives.h @@ -353,7 +353,7 @@ res/raw/browsersearch.json: .locales.deps ; res/raw/suggestedsites.json: .locales.deps ; all_resources = \ - $(DEPTH)/mobile/android/base/AndroidManifest.xml \ + $(abspath $(DEPTH)/mobile/android/base/AndroidManifest.xml) \ $(android_res_files) \ $(ANDROID_GENERATED_RESFILES) \ $(NULL) @@ -457,8 +457,8 @@ ifdef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE .aapt.nodeps: FORCE cp $(gradle_dir)/app/intermediates/res/resources-automation-debug.ap_ gecko-nodeps.ap_ else -# .aapt.nodeps: $(DEPTH)/mobile/android/base/AndroidManifest.xml FORCE -$(eval $(call aapt_command,.aapt.nodeps,$(DEPTH)/mobile/android/base/AndroidManifest.xml FORCE,gecko-nodeps.ap_,gecko-nodeps/,gecko-nodeps/)) +# .aapt.nodeps: $(abspath $(DEPTH)/mobile/android/base/AndroidManifest.xml) FORCE +$(eval $(call aapt_command,.aapt.nodeps,$(abspath $(DEPTH)/mobile/android/base/AndroidManifest.xml) FORCE,gecko-nodeps.ap_,gecko-nodeps/,gecko-nodeps/)) endif # Override the Java settings with some specific android settings @@ -493,7 +493,7 @@ $(ABS_DIST)/fennec/$(OMNIJAR_NAME): FORCE # Targets built very early during a Gradle build. gradle-targets: $(foreach f,$(constants_PP_JAVAFILES),$(f)) -gradle-targets: $(DEPTH)/mobile/android/base/AndroidManifest.xml +gradle-targets: $(abspath $(DEPTH)/mobile/android/base/AndroidManifest.xml) gradle-targets: $(ANDROID_GENERATED_RESFILES) ifndef MOZILLA_OFFICIAL