DO NOT LAND:
Bug 1300144 - Remove "--non-constant-id" from aapt invocations
This patch has landed as another bug (onto fx-team), however I need it temporarily on
reviewboard to do a try build via RB.
(This patch received a BZ only review, hence I landed it direct to fx-team since I don't
know if RB+autoland can handle the case where a patch doesn't have an RB r+.)
MozReview-Commit-ID: HeVQT0rFQzs
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -471,17 +471,16 @@ define aapt_command
-I $(ANDROID_SDK)/android.jar \
$(if $(MOZ_ANDROID_MAX_SDK_VERSION),--max-res-version $(MOZ_ANDROID_MAX_SDK_VERSION),) \
--auto-add-overlay \
$$(addprefix -S ,$$(ANDROID_RES_DIRS)) \
$$(addprefix -A ,$$(ANDROID_ASSETS_DIRS)) \
$(if $(ANDROID_EXTRA_PACKAGES),--extra-packages $$(subst $$(NULL) ,:,$$(strip $$(ANDROID_EXTRA_PACKAGES)))) \
$(if $(ANDROID_EXTRA_RES_DIRS),$$(addprefix -S ,$$(ANDROID_EXTRA_RES_DIRS))) \
--custom-package org.mozilla.gecko \
- --non-constant-id \
--no-version-vectors \
-F $(3) \
-J $(4) \
--output-text-symbols $(5) \
--ignore-assets "$$(ANDROID_AAPT_IGNORE)"
endef
# [Comment 3/3] The first of these rules is used during regular
