Bug 1248160 - Part 3: Move MOZ_ANDROID_SHARED_ID to branding; remove …

…mobile/android/defs.mk. r=ted.mielczarek

MozReview-Commit-ID: KAxIYsHvAC4

configure.in

@@ -8562,10 +8562,12 @@ AC_SUBST(MOZ_CHILD_PROCESS_BUNDLE)
 # "Profile" field, which controls profile location.
 # - MOZ_APP_ID: When set, used for application.ini's "ID" field, and
 # crash reporter server url.
-# - MOZ_APP_ANDROID_VERSION_CODE: On android, "android:versionCode" for
+# - MOZ_APP_ANDROID_VERSION_CODE: On Android, "android:versionCode" for
 # the main application is set to the value of this variable.  If not
 # set, it falls back to a Mozilla-specific value derived from the
 # build ID.
+# - MOZ_ANDROID_SHARED_ID: On Android, "android:sharedUserId" for all Android
+# - packages produced.
 # - MOZ_PROFILE_MIGRATOR: When set, enables profile migrator.
 
 if test -z "$MOZ_APP_NAME"; then
@@ -8584,6 +8586,14 @@ if test -z "$ANDROID_PACKAGE_NAME" ; then
    ANDROID_PACKAGE_NAME="org.mozilla.$MOZ_APP_NAME"
 fi
 
+# Mozilla released Firefox for Android {Release,Beta} and {Aurora,Nightly} to
+# the public with specific common shared IDs and we need to keep them
+# consistent forever.  The specific common values are set by per-channel
+# branding; all other channels use a generic sharedID, set below.
+if test -z "$MOZ_ANDROID_SHARED_ID" ; then
+   MOZ_ANDROID_SHARED_ID="${ANDROID_PACKAGE_NAME}.sharedID"
+fi
+
 # For extensions and langpacks, we require a max version that is compatible
 # across security releases. MOZ_APP_MAXVERSION is our method for doing that.
 # 24.0a1 and 24.0a2 aren't affected
@@ -8614,6 +8624,7 @@ AC_SUBST(MOZ_APP_VENDOR)
 AC_SUBST(MOZ_APP_PROFILE)
 AC_SUBST(MOZ_APP_ID)
 AC_SUBST(MOZ_APP_ANDROID_VERSION_CODE)
+AC_SUBST(MOZ_ANDROID_SHARED_ID)
 AC_SUBST(MAR_CHANNEL_ID)
 AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS)
 AC_SUBST(MOZ_PROFILE_MIGRATOR)

mobile/android/branding/aurora/configure.sh

@@ -6,3 +6,4 @@ MOZ_APP_DISPLAYNAME=Aurora
 ANDROID_PACKAGE_NAME=org.mozilla.fennec_aurora
 MOZ_UPDATER=1
 MOZ_ANDROID_ANR_REPORTER=1
+MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID

mobile/android/branding/beta/configure.sh

@@ -6,3 +6,4 @@ MOZ_APP_DISPLAYNAME="Firefox Beta"
 ANDROID_PACKAGE_NAME=org.mozilla.firefox_beta
 MOZ_UPDATER=
 MOZ_ANDROID_ANR_REPORTER=
+MOZ_ANDROID_SHARED_ID=org.mozilla.firefox.sharedID

mobile/android/branding/nightly/configure.sh

@@ -5,3 +5,4 @@
 MOZ_APP_DISPLAYNAME=Nightly
 MOZ_UPDATER=1
 MOZ_ANDROID_ANR_REPORTER=1
+MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID

mobile/android/branding/official/configure.sh

@@ -6,3 +6,4 @@ MOZ_APP_DISPLAYNAME=Firefox
 ANDROID_PACKAGE_NAME=org.mozilla.firefox
 MOZ_UPDATER=
 MOZ_ANDROID_ANR_REPORTER=
+MOZ_ANDROID_SHARED_ID=org.mozilla.firefox.sharedID