Bug 1254355 - Follow-up: Use full paths to match GENERATED_FILES targets. r=mshal

This was just an error that's not obvious on try builds.  We were
using local paths ($(DEPTH) expands to ../../../ in
mobile/android/base) and GENERATED_FILES produces targets with
absolute paths.

MozReview-Commit-ID: LDhh6mcgSD6

--HG--
extra : rebase_source : be0cf0c41873871082c640d051ead748746eb78c
This commit is contained in:
Nick Alexander 2017-04-21 14:10:05 -07:00
Родитель 096df01180
Коммит c0bab36955
1 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -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