Backed out changeset 10dfe5e3ded1 (bug 1242213), a=permaorange
authorNick Alexander <nalexander@mozilla.com>
Fri, 05 Feb 2016 16:35:45 -0800
changeset 319625 4295f9951e9331a2f2bd0a8ea8c4ad73af141a7b
parent 319624 0885625045f0d07ab8ce6d46d8b354939aa3b617
child 319659 8053a371a52812cc43259f5b486d3c27057661b0
child 319702 3c3e39e9becc24e6bc8b305078e86bfdc9c7f200
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspermaorange
bugs1242213
milestone47.0a1
backs out10dfe5e3ded1621a7ef777ddbc54e5f80696c3d6
first release with
nightly linux32
4295f9951e93 / 47.0a1 / 20160206030207 / files
nightly linux64
4295f9951e93 / 47.0a1 / 20160206030207 / files
nightly mac
4295f9951e93 / 47.0a1 / 20160206030207 / files
nightly win32
4295f9951e93 / 47.0a1 / 20160206030207 / files
nightly win64
4295f9951e93 / 47.0a1 / 20160206030207 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 10dfe5e3ded1 (bug 1242213), a=permaorange
mobile/android/base/AndroidManifest.xml.in
mobile/android/base/Makefile.in
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -1,12 +1,12 @@
 #filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.mozilla.gecko"
+      package="@ANDROID_PACKAGE_NAME@"
       android:installLocation="auto"
       android:versionCode="@ANDROID_VERSION_CODE@"
       android:versionName="@MOZ_APP_VERSION@"
 #ifdef MOZ_ANDROID_SHARED_ID
       android:sharedUserId="@MOZ_ANDROID_SHARED_ID@"
 #endif
       >
     <uses-sdk android:minSdkVersion="@MOZ_ANDROID_MIN_SDK_VERSION@"
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -432,17 +432,16 @@ define aapt_command
 		-M AndroidManifest.xml \
 		-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))) \
-		--rename-manifest-package $(ANDROID_PACKAGE_NAME) \
 		--custom-package org.mozilla.gecko \
 		--non-constant-id \
 		-F $(3) \
 		-J $(4) \
 		--output-text-symbols $(5) \
 		$(if $(MOZ_ANDROID_RESOURCE_CONSTRAINED),-c $(CONSTRAINED_AAPT_CONFIGURATIONS),) \
 		--ignore-assets "$$(ANDROID_AAPT_IGNORE)"
 endef