Bug 1413006 - Use .apk not .ap_ when building --with-gradle. r=maliu
MozReview-Commit-ID: 28NpESuxjf8
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -501,17 +501,17 @@ endef
ifdef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
# .gradle.nodeps: AndroidManifest.xml generated/preprocessed/org/mozilla/gecko/AppConstants.java FORCE
$(eval $(call gradle_command,.gradle.nodeps,AndroidManifest.xml $(constants_PP_JAVAFILES) FORCE))
.aapt.nodeps: .gradle.nodeps FORCE
@$(TOUCH) $@
- cp $(gradle_dir)/app/intermediates/res/resources-official-photon-debug.ap_ gecko-nodeps.ap_
+ cp $(gradle_dir)/app/outputs/apk/app-official-photon-debug.apk gecko-nodeps.ap_
cp $(gradle_dir)/app/intermediates/transforms/dex/officialPhoton/debug/folders/1000/1f/main/classes.dex classes.dex
else
# .aapt.nodeps: AndroidManifest.xml FORCE
$(eval $(call aapt_command,.aapt.nodeps,AndroidManifest.xml FORCE,gecko-nodeps.ap_,gecko-nodeps/,gecko-nodeps/))
endif
# Override the Java settings with some specific android settings
include $(topsrcdir)/config/android-common.mk